banshee r4024 - in trunk/banshee: . src/Clients/Nereid/Nereid

[gburt svn gnome org]

Author: gburt
Date: Thu May 29 16:33:23 2008
New Revision: 4024
URL: http://svn.gnome.org/viewvc/banshee?rev=4024&view=rev

Log:
2008-05-29  Gabriel Burt  <gabriel burt gmail com>

	* src/Clients/Nereid/Nereid/PlayerInterface.cs: Fix crasher introduced by
	yesterday's keybinding fix.  Thanks to wfarr for catching it.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs

Modified: trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs	(original)
+++ trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs	Thu May 29 16:33:23 2008
@@ -440,11 +440,10 @@
                 AddAccelGroup (ActionService.UIManager.AccelGroup);
                 accel_group_active = true;
             }
-            last_focus_entry.FocusOutEvent -= OnEntryFocusOutEvent;
-            last_focus_entry = null;
+
+            (o as Widget).FocusOutEvent -= OnEntryFocusOutEvent;
         }
         
-        private Widget last_focus_entry = null;
         protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
         {
             bool focus_search = false;
@@ -455,9 +454,8 @@
                     RemoveAccelGroup (ActionService.UIManager.AccelGroup);
                     accel_group_active = false;
 
-                    last_focus_entry = Focus;
                     // Reinstate the AccelGroup as soon as the focus leaves the entry
-                    last_focus_entry.FocusOutEvent += OnEntryFocusOutEvent;
+                    Focus.FocusOutEvent += OnEntryFocusOutEvent;
                  }
             } else {
                 if (!accel_group_active) {