From 5894da87594b42baa126cb2a348524cad47f69e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orkun=20=C5=9Eensebat?= Date: Tue, 7 Apr 2015 00:42:11 +0200 Subject: [PATCH] First test if global is set before testing its members --- configuration.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configuration.c b/configuration.c index 6eee97756a..0ae21657ab 100644 --- a/configuration.c +++ b/configuration.c @@ -1654,6 +1654,12 @@ bool config_load_override(void) global_t *global = global_get_ptr(); /* global pointer */ settings_t *settings = config_get_ptr(); /* config pointer */ + if (!global || !settings ) + { + RARCH_ERR("Could not obtain global pointer or configuration file pointer to retrieve path of retroarch.cfg.\n"); + return false; + } + //early return in case a library isn't loaded if(!global->system.info.library_name || !strcmp(global->system.info.library_name,"No Core")) return true; @@ -1661,12 +1667,6 @@ bool config_load_override(void) RARCH_LOG("Game name: %s\n",global->basename); RARCH_LOG("Core name: %s\n",global->system.info.library_name); - if (!global || !settings ) - { - RARCH_ERR("Could not obtain global pointer or configuration file pointer to retrieve path of retroarch.cfg.\n"); - return false; - } - /* Config directory: config_directory. */ if (settings->menu_config_directory) /* Try RGUI path setting first */ strlcpy(config_directory, settings->menu_config_directory, PATH_MAX_LENGTH);