banshee r3780 - in trunk/banshee: . src/Core/Banshee.ThickClient/Banshee.Gui.Widgets

[ahixon svn gnome org]

Author: ahixon
Date: Wed Apr 16 11:33:35 2008
New Revision: 3780
URL: http://svn.gnome.org/viewvc/banshee?rev=3780&view=rev

Log:
2008-04-16  Alexander Hixon  <hixon alexander mediati org>

	* src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:
	Patch by Bertrand Lorentz that fixe an NRE when the player engine would be
	disposed before the	TrackInfoDisplay. Fixes BGO #527888.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs	Wed Apr 16 11:33:35 2008
@@ -93,8 +93,10 @@
                 GLib.Source.Remove (idle_timeout_id);
             }
             
-            ServiceManager.PlayerEngine.EventChanged -= OnPlayerEngineEventChanged;
-            ServiceManager.PlayerEngine.StateChanged -= OnPlayerEngineStateChanged;
+            if (ServiceManager.PlayerEngine != null) {
+                ServiceManager.PlayerEngine.EventChanged -= OnPlayerEngineEventChanged;
+                ServiceManager.PlayerEngine.StateChanged -= OnPlayerEngineStateChanged;
+            }
             
             stage.Iteration -= OnStageIteration;
             stage = null;