rhythmbox r5712 - in trunk: . shell

[hadess svn gnome org]

Author: hadess
Date: Fri May 30 16:10:08 2008
New Revision: 5712
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5712&view=rev

Log:
2008-05-30  Bastien Nocera  <hadess hadess net>

	* shell/main.c (local_load_uri): Don't crash when passing a
	non-local URI, and there's no errors to report (Closes: #532396)



Modified:
   trunk/ChangeLog
   trunk/shell/main.c

Modified: trunk/shell/main.c
==============================================================================
--- trunk/shell/main.c	(original)
+++ trunk/shell/main.c	Fri May 30 16:10:08 2008
@@ -420,9 +420,11 @@
 	GError *error = NULL;
 	rb_debug ("Using load_uri for %s", filename);
 	if (!rb_shell_load_uri (shell, filename, TRUE, &error)) {
-		g_printerr ("Failed to load %s: %s",
-			    filename, error->message);
-		g_error_free (error);
+		if (error != NULL) {
+			g_printerr ("Failed to load %s: %s",
+				    filename, error->message);
+			g_error_free (error);
+		}
 	}
 }