banshee r3979 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Database

[gburt svn gnome org]

Author: gburt
Date: Sun May 25 16:41:45 2008
New Revision: 3979
URL: http://svn.gnome.org/viewvc/banshee?rev=3979&view=rev

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

	* src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:
	Be more careful about NREs in the metadata migration.  And, in case we do
	hit an unexpected exception, close the user-job so it doesn't stay up
	forever.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs	Sun May 25 16:41:45 2008
@@ -759,7 +759,7 @@
                     try {
                         track = DatabaseTrackInfo.Provider.Load (reader);
 
-                        if (!track.Uri.IsFile)
+                        if (track == null || track.Uri == null || !track.Uri.IsFile)
                             continue;
                         
                         try {
@@ -775,6 +775,7 @@
                         track.Album.Save ();
                     } catch (Exception e) {
                         Log.Warning (String.Format ("Failed to update metadata for {0}", track), e.ToString (), false);
+                        job.Finish ();
                         throw;
                     }