From 58c08c0c0295bd1b1304771c3ee533d86510bfe6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 27 Feb 2017 09:33:20 +0100 Subject: [PATCH] Cleanups --- input/input_driver.c | 2 +- menu/menu_driver.c | 2 +- menu/menu_entries.c | 2 +- retroarch.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index e861721da4..c3005e4ce9 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -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; diff --git a/menu/menu_driver.c b/menu/menu_driver.c index c24311d4bc..1ce0cc7e66 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -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. diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 88c745eb1b..e8b0d4e6b4 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -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) diff --git a/retroarch.c b/retroarch.c index 755a138977..6432a6392f 100644 --- a/retroarch.c +++ b/retroarch.c @@ -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