banshee r3682 - in trunk/banshee: . src/Extensions/Banshee.AudioCd/Banshee.AudioCd

[scottp svn gnome org]

Author: scottp
Date: Sun Apr  6 02:05:54 2008
New Revision: 3682
URL: http://svn.gnome.org/viewvc/banshee?rev=3682&view=rev

Log:
* src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:
Got rid of unnessisary null checks.

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs

Modified: trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs	Sun Apr  6 02:05:54 2008
@@ -99,20 +99,8 @@
             
             OnMetadataQueryStarted (mb_disc);
             
-            Query<Release> results = Release.Query (mb_disc);
-            if (results == null) {
-                OnMetadataQueryFinished (false);
-                return;
-            }
-                
-            Release release = results.PerfectMatch ();
-            if (release == null) {
-                OnMetadataQueryFinished (false);
-                return;
-            }
-            
-            ReadOnlyCollection<Track> tracks = release.Tracks;
-            if (tracks == null || tracks.Count != Count) {
+            Release release = Release.Query (mb_disc).PerfectMatch ();
+            if (release == null || release.Tracks.Count != Count) {
                 OnMetadataQueryFinished (false);
                 return;
             }
@@ -121,7 +109,7 @@
             
             int i = 0;
             
-            foreach (Track track in tracks) {
+            foreach (Track track in release.Tracks) {
                 // FIXME: Gather more details from MB to save to the DB
                 this[i].TrackTitle = track.Title;
                 this[i].ArtistName = track.Artist.Name;