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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-02-04 05:01:03 +01:00
parent 2c2ab2a7b9
commit 51290457dd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configuration.c
View File

@ -2444,14 +2444,13 @@ void config_set_defaults(void *data)
#ifdef HAVE_CONFIGFILE #ifdef HAVE_CONFIGFILE
#if defined(HAVE_MENU) && defined(HAVE_RGUI) #if defined(HAVE_MENU) && defined(HAVE_RGUI)
static bool check_menu_driver_compatibility(void) static bool check_menu_driver_compatibility(settings_t *settings)
{ {
settings_t *settings = config_get_ptr();
char *video_driver = settings->arrays.video_driver; char *video_driver = settings->arrays.video_driver;
char *menu_driver = settings->arrays.menu_driver; char *menu_driver = settings->arrays.menu_driver;
if (string_is_equal (menu_driver, "rgui") || if ( string_is_equal(menu_driver, "rgui") ||
string_is_equal(menu_driver, "null") || string_is_equal(menu_driver, "null") ||
string_is_equal(video_driver, "null")) string_is_equal(video_driver, "null"))
return true; return true;
@ -3163,7 +3162,7 @@ static bool config_load_file(global_t *global,
config_read_keybinds_conf(conf); config_read_keybinds_conf(conf);
#if defined(HAVE_MENU) && defined(HAVE_RGUI) #if defined(HAVE_MENU) && defined(HAVE_RGUI)
if (!check_menu_driver_compatibility()) if (!check_menu_driver_compatibility(settings))
strlcpy(settings->arrays.menu_driver, "rgui", sizeof(settings->arrays.menu_driver)); strlcpy(settings->arrays.menu_driver, "rgui", sizeof(settings->arrays.menu_driver));
#endif #endif