diff options
| author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-07-08 16:18:57 +0000 |
|---|---|---|
| committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-07-08 16:18:57 +0000 |
| commit | f46ca6cc420a1a952413e030e5c8c1341a731374 (patch) | |
| tree | d5b6f9de6e55a332a8a536494ba0d3b50dd0f5a7 | |
| parent | f7acd9df8f707b60b94c5d23005c12702122fe26 (diff) | |
| download | libgpod-f46ca6cc420a1a952413e030e5c8c1341a731374.tar.gz libgpod-f46ca6cc420a1a952413e030e5c8c1341a731374.tar.xz libgpod-f46ca6cc420a1a952413e030e5c8c1341a731374.zip | |
* src/itdb_itunesdb.c (itdb_write): don't crash if error ==
NULL (SF tracker bugs item #1519048)
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1308 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/itdb_itunesdb.c | 13 |
2 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2006-07-08 Jorg Schuler <jcsjcs at users.sourceforge.net> + + * src/itdb_itunesdb.c (itdb_write): don't crash if error == + NULL (SF tracker bugs item #1519048) + 2006-07-02 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/itdb_itunesdb.c (itdb_init_ipod): only write iTunesSD diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c index 4868037..9820c36 100644 --- a/src/itdb_itunesdb.c +++ b/src/itdb_itunesdb.c @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-07-02 13:26:31 jcs> +/* Time-stamp: <2006-07-09 01:16:49 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -4313,12 +4313,13 @@ gboolean itdb_write (Itdb_iTunesDB *itdb, GError **error) g_free (itunes_path); if (result == TRUE) - result = itdb_rename_files (itdb_get_mountpoint (itdb), error); - - /* Write SysInfo file if it has changed */ - if (!(*error) && itdb->device->sysinfo_changed) { - itdb_device_write_sysinfo (itdb->device, error); + /* Write SysInfo file if it has changed */ + if (itdb->device->sysinfo_changed) + { + itdb_device_write_sysinfo (itdb->device, error); + } + result = itdb_rename_files (itdb_get_mountpoint (itdb), error); } /* make sure all buffers are flushed as some people tend to |