commit c16fd8b1239d640cc46878dd3ccdc9af532d7725
Author: Christophe Fergeau <t...@gnome.org>
Date:   Mon Jan 3 00:24:56 2011 +0100

    failing to parse recent playcounts isn't fatal
    
    When an error occurs when parsing the playcounts file, the loading
    of the iPod database was aborted. This error can be safely ignored,
    it's better to lose information about the recently played songs
    rather than failing entirely to load the ipod database.

 src/itdb_itunesdb.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index ad823bb..8d1e5c7 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -3279,12 +3279,13 @@ itdb_parse_internal (Itdb_iTunesDB *itdb, gboolean 
compressed, GError **error)
                                       fimp->fcontents->length);
        if (playcounts_init (fimp))
        {
-           if (parse_fimp (fimp, compressed))
+           g_warning ("Error parsing recent playcounts");
+       }
+       if (parse_fimp (fimp, compressed))
+       {
+           if (read_OTG_playlists (fimp))
            {
-               if (read_OTG_playlists (fimp))
-               {
-                   success = TRUE;
-               }
+               success = TRUE;
            }
        }
     }

------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to