diff --git a/frontend/frontend.c b/frontend/frontend.c index d78856143f..1cfb3d5e2a 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -41,9 +41,6 @@ int main(int argc, char *argv[]) int init_ret; if ((init_ret = rarch_main_init(argc, argv))) return init_ret; - // Avoid reloading config on every ROM load. - g_extern.block_config_read = true; - #ifdef HAVE_RGUI menu_init(); g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME; diff --git a/frontend/frontend_bbqnx.c b/frontend/frontend_bbqnx.c index 4618a122cb..5dfca69f8c 100644 --- a/frontend/frontend_bbqnx.c +++ b/frontend/frontend_bbqnx.c @@ -30,7 +30,6 @@ int rarch_main(int argc, char *argv[]) g_extern.verbose = true; - int init_ret; struct rarch_main_wrap args = {0}; args.verbose = g_extern.verbose; @@ -40,13 +39,14 @@ int rarch_main(int argc, char *argv[]) args.libretro_path = "/accounts/1000/appdata/com.RetroArch.testDev_m_RetroArch181dafc7/app/native/lib/test.so"; args.config_path = "/accounts/1000/appdata/com.RetroArch.testDev_m_RetroArch181dafc7/app/native/retroarch.cfg"; - if ((init_ret = rarch_main_init_wrap(&args))) - { - return init_ret; - } rarch_init_msg_queue(); + + int init_ret; + if ((init_ret = rarch_main_init_wrap(&args))) return init_ret; + while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate()); rarch_main_deinit(); + rarch_deinit_msg_queue(); #ifdef PERF_TEST diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c index a3eae52983..1019f2a676 100644 --- a/frontend/frontend_console.c +++ b/frontend/frontend_console.c @@ -209,7 +209,6 @@ int rarch_main(int argc, char *argv[]) #ifdef HAVE_LIBRETRO_MANAGEMENT char core_exe_path[PATH_MAX]; char path_prefix[PATH_MAX]; - const char *extension = DEFAULT_EXE_EXT; char slash; #if defined(_WIN32) slash = '\\'; @@ -218,14 +217,14 @@ int rarch_main(int argc, char *argv[]) #endif snprintf(path_prefix, sizeof(path_prefix), "%s%c", default_paths.core_dir, slash); - snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension); + snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, DEFAULT_EXE_EXT); if (path_file_exists(core_exe_path)) { - RARCH_LOG("core_exe_path: %s\n", core_exe_path); - if (install_libretro_core(core_exe_path, path_prefix, extension)) + if (install_libretro_core(core_exe_path, path_prefix, DEFAULT_EXE_EXT)) { - RARCH_LOG("New default libretro core saved to config file: %s.\n", g_settings.libretro); + RARCH_LOG("New default libretro core [%s] saved to config file: %s.\n", core_exe_path, + g_settings.libretro); config_save_file(g_extern.config_path); } } diff --git a/settings.c b/settings.c index 35aeeb822c..c00e2a56fa 100644 --- a/settings.c +++ b/settings.c @@ -301,7 +301,10 @@ void config_set_defaults(void) #ifdef _XBOX1 g_extern.console.sound.volume_level = 0; #endif +#endif +#if defined(HAVE_RMENU) || defined(HAVE_RGUI) + /* Avoid reloading config on every ROM load */ g_extern.block_config_read = true; #endif