This commit is contained in:
twinaphex 2017-02-27 09:33:20 +01:00
parent 10bf8d4a8a
commit 58c08c0c02
4 changed files with 4 additions and 4 deletions

View File

@ -907,7 +907,7 @@ uint64_t input_keys_pressed(
const struct retro_keybind *focus_binds_auto = &settings->input.autoconf_binds[0][RARCH_GAME_FOCUS_TOGGLE];
const struct retro_keybind *focus_normal = &binds[RARCH_GAME_FOCUS_TOGGLE];
bool enable_hotkey_valid = settings->input.binds[0][RARCH_ENABLE_HOTKEY].valid;
bool enable_hotkey_valid = settings && settings->input.binds[0][RARCH_ENABLE_HOTKEY].valid;
bool game_focus_toggle_valid = false;
joypad_info.joy_idx = 0;

View File

@ -263,7 +263,7 @@ static void menu_driver_toggle(bool on)
/* Stop all rumbling before entering the menu. */
command_event(CMD_EVENT_RUMBLE_STOP, NULL);
if (settings->menu.pause_libretro)
if (settings && settings->menu.pause_libretro)
command_event(CMD_EVENT_AUDIO_STOP, NULL);
/* Override keyboard callback to redirect to menu instead.

View File

@ -282,7 +282,7 @@ int menu_entries_get_core_title(char *s, size_t len)
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info);
if (!settings->menu.core_enable)
if (!settings || !settings->menu.core_enable)
return -1;
if (string_is_empty(core_name) && info)

View File

@ -1338,7 +1338,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
#ifdef HAVE_OVERLAY
{
settings_t *settings = config_get_ptr();
if (settings->input.overlay_hide_in_menu)
if (settings && settings->input.overlay_hide_in_menu)
command_event(CMD_EVENT_OVERLAY_DEINIT, NULL);
}
#endif