| 1 |
--- sonata/main.py.orig 2009-09-21 21:02:16 UTC |
| 2 |
+++ sonata/main.py |
| 3 |
@@ -989,13 +989,14 @@ class Base(object): |
| 4 |
self.repeatmenu.set_active(self.status['repeat'] == '1') |
| 5 |
if not self.last_random or self.last_random != self.status['random']: |
| 6 |
self.randommenu.set_active(self.status['random'] == '1') |
| 7 |
- if self.status['xfade'] == '0': |
| 8 |
- self.config.xfade_enabled = False |
| 9 |
- else: |
| 10 |
- self.config.xfade_enabled = True |
| 11 |
- self.config.xfade = int(self.status['xfade']) |
| 12 |
- if self.config.xfade > 30: |
| 13 |
- self.config.xfade = 30 |
| 14 |
+ self.config.xfade_enabled = False |
| 15 |
+ if 'xfade' in self.status: |
| 16 |
+ xfade = int(self.status['xfade']) |
| 17 |
+ if xfade != 0: |
| 18 |
+ self.config.xfade_enabled = True |
| 19 |
+ self.config.xfade = xfade |
| 20 |
+ if self.config.xfade > 30: |
| 21 |
+ self.config.xfade = 30 |
| 22 |
self.last_repeat = self.status['repeat'] |
| 23 |
self.last_random = self.status['random'] |
| 24 |
return |
| 25 |
@@ -3400,4 +3401,7 @@ class Base(object): |
| 26 |
self.on_currsong_notify(force_popup=True) |
| 27 |
|
| 28 |
def main(self): |
| 29 |
+ gtk.gdk.threads_init() |
| 30 |
+ gtk.gdk.threads_enter() |
| 31 |
gtk.main() |
| 32 |
+ gtk.gdk.threads_leave() |
