mirror of
https://github.com/libretro/RetroArch
synced 2025-02-10 12:40:03 +00:00
block_config_read is set to true in config_set_defaults
This commit is contained in:
parent
fefb65b84a
commit
7465b25483
@ -41,9 +41,6 @@ int main(int argc, char *argv[])
|
|||||||
int init_ret;
|
int init_ret;
|
||||||
if ((init_ret = rarch_main_init(argc, argv))) return 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
|
#ifdef HAVE_RGUI
|
||||||
menu_init();
|
menu_init();
|
||||||
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
|
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
|
||||||
|
@ -30,7 +30,6 @@ int rarch_main(int argc, char *argv[])
|
|||||||
|
|
||||||
g_extern.verbose = true;
|
g_extern.verbose = true;
|
||||||
|
|
||||||
int init_ret;
|
|
||||||
struct rarch_main_wrap args = {0};
|
struct rarch_main_wrap args = {0};
|
||||||
|
|
||||||
args.verbose = g_extern.verbose;
|
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.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";
|
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();
|
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());
|
while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
|
||||||
rarch_main_deinit();
|
rarch_main_deinit();
|
||||||
|
|
||||||
rarch_deinit_msg_queue();
|
rarch_deinit_msg_queue();
|
||||||
|
|
||||||
#ifdef PERF_TEST
|
#ifdef PERF_TEST
|
||||||
|
@ -209,7 +209,6 @@ int rarch_main(int argc, char *argv[])
|
|||||||
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
||||||
char core_exe_path[PATH_MAX];
|
char core_exe_path[PATH_MAX];
|
||||||
char path_prefix[PATH_MAX];
|
char path_prefix[PATH_MAX];
|
||||||
const char *extension = DEFAULT_EXE_EXT;
|
|
||||||
char slash;
|
char slash;
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
slash = '\\';
|
slash = '\\';
|
||||||
@ -218,14 +217,14 @@ int rarch_main(int argc, char *argv[])
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
snprintf(path_prefix, sizeof(path_prefix), "%s%c", default_paths.core_dir, slash);
|
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))
|
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, DEFAULT_EXE_EXT))
|
||||||
if (install_libretro_core(core_exe_path, path_prefix, extension))
|
|
||||||
{
|
{
|
||||||
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);
|
config_save_file(g_extern.config_path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -301,7 +301,10 @@ void config_set_defaults(void)
|
|||||||
#ifdef _XBOX1
|
#ifdef _XBOX1
|
||||||
g_extern.console.sound.volume_level = 0;
|
g_extern.console.sound.volume_level = 0;
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_RMENU) || defined(HAVE_RGUI)
|
||||||
|
/* Avoid reloading config on every ROM load */
|
||||||
g_extern.block_config_read = true;
|
g_extern.block_config_read = true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user