ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

default paths overwriting code now gets applied for all platforms

This commit is contained in:
twinaphex 2014-06-01 04:46:57 +02:00
parent 6fa7e1894e
commit 62cd5bbe8a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console/rarch_console.h
View File

@ -40,6 +40,6 @@ typedef struct
char system_dir[PATH_MAX]; char system_dir[PATH_MAX];
} default_paths_t; } default_paths_t;
extern default_paths_t default_paths; default_paths_t default_paths;
#endif #endif

3
settings.c
View File

@ -21,6 +21,7 @@
#include "file.h" #include "file.h"
#include "compat/posix_string.h" #include "compat/posix_string.h"
#include "input/input_common.h" #include "input/input_common.h"
#include "console/rarch_console.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -475,7 +476,6 @@ void config_set_defaults(void)
if (default_config_path) if (default_config_path)
fill_pathname_expand_special(g_extern.config_path, default_config_path, sizeof(g_extern.config_path)); fill_pathname_expand_special(g_extern.config_path, default_config_path, sizeof(g_extern.config_path));
#ifdef RARCH_CONSOLE
if (*default_paths.assets_dir) if (*default_paths.assets_dir)
strlcpy(g_settings.assets_directory, default_paths.assets_dir, sizeof(g_settings.assets_directory)); strlcpy(g_settings.assets_directory, default_paths.assets_dir, sizeof(g_settings.assets_directory));
if (*default_paths.core_dir) if (*default_paths.core_dir)
@ -497,7 +497,6 @@ void config_set_defaults(void)
if (*default_paths.config_path) if (*default_paths.config_path)
strlcpy(g_extern.config_path, default_paths.config_path, sizeof(g_extern.config_path)); strlcpy(g_extern.config_path, default_paths.config_path, sizeof(g_extern.config_path));
#endif
g_extern.config_save_on_exit = config_save_on_exit; g_extern.config_save_on_exit = config_save_on_exit;