From 0cd8adc78919af4e43eea1945b175c08d7883d61 Mon Sep 17 00:00:00 2001 From: Massimiliano Calamelli Date: Mon, 26 Jan 2009 23:49:33 +0000 Subject: [PATCH] Add a little guard for vol->icon == NULL. Without this, if you left-click on desktop and go to "Places", E crashes. SVN revision: 38802 --- src/e_mod_places.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/e_mod_places.c b/src/e_mod_places.c index 1ecfd08..6ba46b3 100644 --- a/src/e_mod_places.c +++ b/src/e_mod_places.c @@ -369,12 +369,15 @@ places_generate_menu(void *data, E_Menu *em) else e_menu_item_label_set(mi, ecore_file_file_get(vol->mount_point)); - if (strncmp(vol->icon, "e/", 2)) - e_menu_item_icon_edje_set(mi, theme_file, vol->icon); - else - e_menu_item_icon_edje_set(mi, - e_theme_edje_file_get("base/theme/fileman", - vol->icon), vol->icon); + if (vol->icon) + { + if (strncmp(vol->icon, "e/", 2)) + e_menu_item_icon_edje_set(mi, theme_file, vol->icon); + else + e_menu_item_icon_edje_set(mi, + e_theme_edje_file_get("base/theme/fileman", + vol->icon), vol->icon); + } e_menu_item_callback_set(mi, places_menu_click_cb, (void*)vol); }