mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-20 10:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

First test if global is set before testing its members

Browse Source
This commit is contained in:
Orkun Şensebat 2015-04-07 00:42:11 +02:00
parent a1217a9e08
commit 5894da8759
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configuration.c
View File

@ -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);