diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index b76738df97..964493d96c 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1735,6 +1735,8 @@ static int action_ok_audio_add_to_mixer_and_collection(const char *path, char combined_path[PATH_MAX_LENGTH]; menu_handle_t *menu = NULL; + combined_path[0] = '\0'; + if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) return menu_cbs_exit(); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index c8d8dc23b9..995e9a695b 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4115,6 +4115,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) { char combined_path[PATH_MAX_LENGTH]; + combined_path[0] = '\0'; + fill_pathname_join(combined_path, menu->scratch2_buf, menu->scratch_buf, sizeof(combined_path)); @@ -4281,7 +4283,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); if (string_is_equal(info->path, file_path_str(FILE_PATH_CONTENT_HISTORY))) { - if (menu_displaylist_ctl(DISPLAYLIST_HISTORY, info) && info) + if (menu_displaylist_ctl(DISPLAYLIST_HISTORY, info)) return menu_displaylist_process(info); return false; }