banshee r3250 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.MediaEngine

[abock svn gnome org]

Author: abock
Date: Sat Feb 16 23:53:39 2008
New Revision: 3250
URL: http://svn.gnome.org/viewvc/banshee?rev=3250&view=rev

Log:
2008-02-16  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:
    Fixed bug with the new NullPlayerEngine fallback loading



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs	Sat Feb 16 23:53:39 2008
@@ -82,13 +82,6 @@
                 LoadEngine (node);
             }
             
-            if (default_engine == null || active_engine == null || engines == null || engines.Count == 0) {
-                Log.Warning (Catalog.GetString (
-                    "No player engines were found. Please ensure Banshee has been cleanly installed."),
-                    "Using the featureless NullPlayerEngine.");
-                LoadEngine (new NullPlayerEngine ());
-            }
-            
             if (default_engine != null) {
                 active_engine = default_engine;
                 Log.Debug (Catalog.GetString ("Default player engine"), active_engine.Name);
@@ -96,6 +89,16 @@
                 default_engine = active_engine;
             }
             
+            if (default_engine == null || active_engine == null || engines == null || engines.Count == 0) {
+                Log.Warning (Catalog.GetString (
+                    "No player engines were found. Please ensure Banshee has been cleanly installed."),
+                    "Using the featureless NullPlayerEngine.");
+                PlayerEngine null_engine = new NullPlayerEngine ();
+                LoadEngine (null_engine);
+                active_engine = null_engine;
+                default_engine = null_engine;
+            }
+            
             MetadataService.Instance.HaveResult += OnMetadataServiceHaveResult;
         }