summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNelson Benítez León <nbenitezl+gnome@gmail.com>2013-11-10 16:34:29 +0100
committerCosimo Cecchi <cosimoc@gnome.org>2014-02-17 13:19:44 -0800
commita1b42a6756d478492303a89273236b2a8c56f387 (patch)
tree89d45c0e45570ac3b977e5448be1a13b5ff56536
parentcea06af55baf8a2644c1b1afd6fe6d09c813dbc2 (diff)
downloadnautilus-a1b42a6756d478492303a89273236b2a8c56f387.tar.gz
properties: fix crash when entering an unsupported URI
https://bugzilla.gnome.org/show_bug.cgi?id=711480
-rw-r--r--src/nautilus-properties-window.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 4cf72448a..df8d69f51 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -5406,7 +5406,11 @@ custom_icon_file_chooser_response_cb (GtkDialog *dialog,
case GTK_RESPONSE_OK:
uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
- set_icon (uri, window);
+ if (uri != NULL) {
+ set_icon (uri, window);
+ } else {
+ reset_icon (window);
+ }
g_free (uri);
break;