From 1d39902e3c287c2dfcc45afd791f2bd63473ff76 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 9 Mar 2015 01:33:42 +0100 Subject: [PATCH] (Mouse) mouse_post_iterate - prevent segfault --- menu/menu_entries_cbs_iterate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c index cec17fcfa7..e25d41b636 100644 --- a/menu/menu_entries_cbs_iterate.c +++ b/menu/menu_entries_cbs_iterate.c @@ -175,12 +175,12 @@ static int mouse_post_iterate(menu_file_list_cbs_t *cbs, const char *path, #if 0 RARCH_LOG("action OK: %d\n", cbs && cbs->action_ok); RARCH_LOG("action toggle: %d\n", cbs && cbs->action_toggle); - if (setting->type) + if (setting && setting->type) RARCH_LOG("action type: %d\n", setting->type); #endif if (menu->mouse.ptr == menu->navigation.selection_ptr - && cbs && cbs->action_toggle && + && cbs && cbs->action_toggle && setting && (setting->type == 2 || setting->type == 4 || setting->type == 5 || setting->type == 8)) return cbs->action_toggle(type, label, MENU_ACTION_RIGHT);