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
This commit is contained in:
parent
87ca4e8d96
commit
0cd8adc789
|
@ -369,12 +369,15 @@ places_generate_menu(void *data, E_Menu *em)
|
||||||
else
|
else
|
||||||
e_menu_item_label_set(mi, ecore_file_file_get(vol->mount_point));
|
e_menu_item_label_set(mi, ecore_file_file_get(vol->mount_point));
|
||||||
|
|
||||||
if (strncmp(vol->icon, "e/", 2))
|
if (vol->icon)
|
||||||
e_menu_item_icon_edje_set(mi, theme_file, vol->icon);
|
{
|
||||||
else
|
if (strncmp(vol->icon, "e/", 2))
|
||||||
e_menu_item_icon_edje_set(mi,
|
e_menu_item_icon_edje_set(mi, theme_file, vol->icon);
|
||||||
e_theme_edje_file_get("base/theme/fileman",
|
else
|
||||||
vol->icon), vol->icon);
|
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);
|
e_menu_item_callback_set(mi, places_menu_click_cb, (void*)vol);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue