prevent certain keys from causing events

multani · Oct 13, 2006 · 8fbd204 · 8fbd204
1 parent 3f38b0f
commit 8fbd204
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 v0.8.1 - Pending
 	+ Add Polish translation (Tomasz Dominikowski)
+	+ Bug: Prevent certain keys from causing events
 
 v0.8 - October 7, 2006
 	+ Allow user formatting of current playlist, library, and title

diff --git a/TODO b/TODO
@@ -6,6 +6,7 @@ v0.9
 	make selection, dnd, more like thunar
 	make remote images non-blocking
 	break up main app vs notification window translations (see email)
+	sonata --play, --pause, --stop, etc
 
 Future:
 	allow multiple columns?

diff --git a/sonata.py b/sonata.py
@@ -886,7 +886,7 @@ def update_status(self):
                 except:
                     self.status = None
                 self.songinfo = self.conn.do.currentsong()
-                try:
+                if self.status:
                     if self.repeat and self.status.repeat == '0':
                         self.conn.do.repeat(1)
                     elif not self.repeat and self.status.repeat == '1':
@@ -895,8 +895,6 @@ def update_status(self):
                         self.conn.do.random(1)
                     elif not self.shuffle and self.status.random == '1':
                         self.conn.do.random(0)
-                except:
-                    pass
             else:
                 self.iterate_time = self.iterate_time_when_disconnected
                 self.status = None
@@ -948,12 +946,12 @@ def topwindow_keypress(self, widget, event):
         shortcut = shortcut.replace("<Mod2>", "")
         # These shortcuts were moved here so that they don't
         # interfere with searching the library
-        if shortcut in 'BackSpace':
+        if shortcut == 'BackSpace':
             self.parent_dir(None)
-        elif shortcut in 'Escape':
+        elif shortcut == 'Escape':
             if self.minimize_to_systray:
                 self.withdraw_app()
-        elif shortcut in 'Delete':
+        elif shortcut == 'Delete':
             self.remove(None)
 
     def settings_load(self):