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

fix some warnings

Browse Source
This commit is contained in:
radius 2015-04-06 20:22:33 -05:00
parent 1293122826
commit 45040cd29b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration.c
View File

@ -1748,12 +1748,12 @@ bool config_load_override(void)
* *
* Returns: false if there was an error. * Returns: false if there was an error.
*/ */
bool core_unload_override(void) bool config_unload_override(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
*global->append_config_path = NULL; *global->append_config_path = '\0';
if (config_load_file(global->config_path, false)) if (config_load_file(global->config_path, false))
{ {
RARCH_LOG("Configuration overrides unloaded, original configuration reset\n"); RARCH_LOG("Configuration overrides unloaded, original configuration reset\n");

6
retroarch.c
View File

@ -24,6 +24,7 @@
#include "libretro_version_1.h" #include "libretro_version_1.h"
#include "dynamic.h" #include "dynamic.h"
#include "content.h" #include "content.h"
#include "configuration.h"
#include <file/file_path.h> #include <file/file_path.h>
#include <file/dir_list.h> #include <file/dir_list.h>
#include "general.h" #include "general.h"
@ -1857,7 +1858,7 @@ static void deinit_core(bool reinit)
if(global->overrides_active) if(global->overrides_active)
{ {
core_unload_override(); config_unload_override();
pretro_set_environment(rarch_environment_cb); pretro_set_environment(rarch_environment_cb);
} }
@ -1906,8 +1907,7 @@ static bool init_core(void)
pretro_set_environment(rarch_environment_cb); pretro_set_environment(rarch_environment_cb);
if (!config_load_remap()) config_load_remap();
RARCH_ERR("Error loading remap files\n");
verify_api_version(); verify_api_version();
pretro_init(); pretro_init();