sound-juicer r2110 - in trunk: . src

[rburton svn gnome org]

Author: rburton
Date: Wed Mar  5 14:58:08 2008
New Revision: 2110
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2110&view=rev

Log:
2008-03-05  Ross Burton  <ross burtonini com>

	* src/sj-prefs.c:
	Fix crash when opening prefs dialogs (#59925, based on a patch by
	Matthew Martin).


Modified:
   trunk/ChangeLog
   trunk/src/sj-prefs.c

Modified: trunk/src/sj-prefs.c
==============================================================================
--- trunk/src/sj-prefs.c	(original)
+++ trunk/src/sj-prefs.c	Wed Mar  5 14:58:08 2008
@@ -123,8 +123,9 @@
   current_uri = gconf_client_get_string (gconf_client, GCONF_BASEURI, NULL);
   new_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)); 
 
-  if (strcmp(current_uri, new_uri) != 0)  
-    gconf_client_set_string (gconf_client, GCONF_BASEURI, new_uri, NULL);
+  if (current_uri == NULL || strcmp(current_uri, new_uri) != 0) {
+      gconf_client_set_string (gconf_client, GCONF_BASEURI, new_uri, NULL);
+  }
   
   g_free (new_uri);
   g_free (current_uri);