Revision: 1681
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1681&view=rev
Author: jcsjcs
Date: 2007-08-17 23:16:04 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
* src/autodetection.c (ad_timeout_cb): avoid crash when
iTunesDB could not be read successfully.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog_detailed
gtkpod/trunk/src/autodetection.c
Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed 2007-08-18 04:14:21 UTC (rev 1680)
+++ gtkpod/trunk/ChangeLog_detailed 2007-08-18 06:16:04 UTC (rev 1681)
@@ -1,3 +1,8 @@
+2007-08-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/autodetection.c (ad_timeout_cb): avoid crash when
+ iTunesDB could not be read successfully.
+
2007-08-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/file_convert.c (conversion_log_append): don't append
Modified: gtkpod/trunk/src/autodetection.c
===================================================================
--- gtkpod/trunk/src/autodetection.c 2007-08-18 04:14:21 UTC (rev 1680)
+++ gtkpod/trunk/src/autodetection.c 2007-08-18 06:16:04 UTC (rev 1681)
@@ -387,8 +387,16 @@
if (!eitdb->itdb_imported)
{
loaded_itdb = gp_load_ipod (itdb);
- loaded_itdb->usertype |= GP_ITDB_TYPE_AUTOMATIC;
- set_itdb_prefs_int (loaded_itdb, "type",
loaded_itdb->usertype);
+ if (loaded_itdb)
+ {
+ loaded_itdb->usertype |= GP_ITDB_TYPE_AUTOMATIC;
+ set_itdb_prefs_int (loaded_itdb, "type",
loaded_itdb->usertype);
+ }
+ else
+ {
+ gtkpod_warning (_("Newly mounted iPod at '%s' could not
be loaded into gtkpod.\n\n"),
+ mountpoint);
+ }
}
else
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
