[gtpd-cvs] gtkpod/src file_export.c,1.64,1.65

[jcsjcs]

Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32654/src

Modified Files:
        file_export.c 
Log Message:
        * src/file_export.c: only write error messages for track for
          which export failed and not all subsequent tracks as
          well. Thanks to Joachim Tesch for the patch.



Index: file_export.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_export.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- file_export.c       24 Jun 2006 15:39:22 -0000      1.64
+++ file_export.c       3 Oct 2006 14:12:00 -0000       1.65
@@ -436,6 +436,7 @@
        start = time(NULL);
        for(l = fcd->tracks; l && !abort; l = l->next)
        {
+           gboolean resultWrite = TRUE;
            Track *tr = (Track*)l->data;
 
            fcd->track = tr;
@@ -456,18 +457,21 @@
                    g_cond_timed_wait (cond, mutex, &gtime);
                } while(!mutex_data);
                g_mutex_unlock (mutex);
-               result &= (gboolean)GPOINTER_TO_INT(g_thread_join (thread));
+               resultWrite = (gboolean)GPOINTER_TO_INT(g_thread_join (thread));
+               result &= resultWrite;
            }
            else {
                g_warning ("Thread creation failed, falling back to 
default.\n");
-               result &= write_track (fcd);
+               resultWrite = write_track (fcd);
+               result &= resultWrite;
            }
 #else
-           result &= write_track (fcd);
+           resultWrite = write_track (fcd);
+           result &= resultWrite;
            while (widgets_blocked && gtk_events_pending ())
                gtk_main_iteration ();
 #endif
-           if (!result)
+           if (!resultWrite)
            {
                gtkpod_warning (_("Failed to write '%s-%s'\n"), tr->artist, 
tr->title); 
            }


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2