libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-17 16:10:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(Xbox 1 Salamander) Set first file fixed

Browse Source 
(RARCH_CONSOLE) If a config file doesn't exist, it has to
be created before we attempt to save it or else we will run
into an unfortunate 'chicken egg problem' - confirmed problem
on Xbox 1
This commit is contained in:
twinaphex 2012-08-22 17:39:44 +02:00
parent eca2c09fdd
commit 2abe11cb55
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
console/rarch_console_config.c
View File

@ -27,7 +27,15 @@ void rarch_config_load(const char * conf_name, const char * libretro_dir_path, c
config_file_t * conf = config_file_new(conf_name);
if(!conf)
{
#ifdef RARCH_CONSOLE
FILE * f;
RARCH_ERR("Config file \"%s\" doesn't exist. Creating...\n", conf_name);
f = fopen(conf_name, "w");
fclose(f);
#endif
return;
}
#ifdef HAVE_LIBRETRO_MANAGEMENT
if(find_libretro_path)
@ -122,7 +130,10 @@ void rarch_config_save(const char * conf_name)
config_file_t * conf = config_file_new(conf_name);
if(!conf)
{
RARCH_ERR("Failed to write config file to \"%s\". Check permissions.\n", conf_name);
return;
}
// g_settings
config_set_string(conf, "libretro_path", g_settings.libretro);

3
xdk/frontend/main.c
View File

@ -206,8 +206,7 @@ begin_loop:
goto begin_loop;
begin_shutdown:
if(path_file_exists(default_paths.config_file))
rarch_config_save(default_paths.config_file);
rarch_config_save(default_paths.config_file);
menu_free();
#if defined(HAVE_D3D8) || defined(HAVE_D3D9)

28
xdk/salamander/main.c
View File

@ -54,12 +54,19 @@ static void find_and_set_first_file(void)
#if defined(_XBOX360)
"game:\\", "xex"
#elif defined(_XBOX1)
"D:\\", "xbe"
"D:", "xbe"
#endif
);
if(first_file)
{
#ifdef _XBOX1
snprintf(libretro_path, sizeof(libretro_path), "D:\\%s", first_file);
#else
strlcpy(libretro_path, first_file, sizeof(libretro_path));
#endif
RARCH_LOG("libretro_path now set to: %s.\n", libretro_path);
}
else
RARCH_ERR("Failed last fallback - RetroArch Salamander will exit.\n");
}
@ -67,17 +74,9 @@ static void find_and_set_first_file(void)
static void init_settings(void)
{
char tmp_str[PATH_MAX];
bool config_file_exists;
bool config_file_exists = false;
if(!path_file_exists(SYS_CONFIG_FILE))
{
FILE * f;
config_file_exists = false;
RARCH_ERR("Config file \"%s\" doesn't exist. Creating...\n", SYS_CONFIG_FILE);
f = fopen(SYS_CONFIG_FILE, "w");
fclose(f);
}
else
if(path_file_exists(SYS_CONFIG_FILE))
config_file_exists = true;
//try to find CORE executable
@ -99,11 +98,11 @@ static void init_settings(void)
if(config_file_exists)
{
config_file_t * conf = config_file_new(SYS_CONFIG_FILE);
config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
snprintf(libretro_path, sizeof(libretro_path), tmp_str);
config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
snprintf(libretro_path, sizeof(libretro_path), tmp_str);
}
if(!config_file_exists || !strcmp(libretro_path, ""))
if(!config_file_exists || strcmp(libretro_path, "") == 0)
find_and_set_first_file();
else
{
@ -170,6 +169,7 @@ static void get_environment_settings (void)
int main(int argc, char *argv[])
{
XINPUT_STATE state;
(void)state;
get_environment_settings();