[Python-apps-commits] r1607 - in packages/lightyears/trunk/debian (2 files)

[rainct-guest at users.alioth.debian.org]

    Date: Tuesday, July 22, 2008 @ 14:15:12
  Author: rainct-guest
Revision: 1607

Fix Ubuntu bug #194183.

Added:
  packages/lightyears/trunk/debian/patches/fix_crash_in_sound_py.patch
Modified:
  packages/lightyears/trunk/debian/changelog

Modified: packages/lightyears/trunk/debian/changelog
===================================================================
--- packages/lightyears/trunk/debian/changelog	2008-07-22 13:58:48 UTC (rev 1606)
+++ packages/lightyears/trunk/debian/changelog	2008-07-22 14:15:12 UTC (rev 1607)
@@ -10,7 +10,10 @@
   * debian/menu:
     - Change the formatting.
   * debian/patches/only_show_valid_resolutions.patch:
-    - Only show resolutions supported by the system in the menu.
+    - Only show resolutions supported by the system in the menu (LP: #219512).
+  * debian/patches/fix_crash_in_sound_py.patch:
+    - Avoid a crash which could happen when no sound channels were
+      available; thanks to James Westby (LP: #194183).
 
   [ Sandro Tosi ]
   * debian/watch:

Added: packages/lightyears/trunk/debian/patches/fix_crash_in_sound_py.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/fix_crash_in_sound_py.patch	                        (rev 0)
+++ packages/lightyears/trunk/debian/patches/fix_crash_in_sound_py.patch	2008-07-22 14:15:12 UTC (rev 1607)
@@ -0,0 +1,14 @@
+diff -Nur -x '*.orig' -x '*~' lightyears-1.3a/code/sound.py lightyears-1.3a.new/code/sound.py
+--- lightyears-1.3a/code/sound.py	2008-07-22 16:09:25.000000000 +0200
++++ lightyears-1.3a.new/code/sound.py	2008-07-22 16:10:14.000000000 +0200
+@@ -43,8 +43,8 @@
+             or ( not ( self.schan.get_sound() 
+                             in [ self.sobj , self.sobj2 ] ))):
+                 self.schan = self.sobj.play()
+-
+-            self.schan.queue(self.sobj2)
++            if self.schan:
++                self.schan.queue(self.sobj2)
+ 
+     def Fade_Out(self):
+         if (( self.sobj == None )