libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-03 15:54:39 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Remove config_realloc

Browse Source
This commit is contained in:
twinaphex 2016-05-27 05:05:27 +02:00
parent 2b4baa0452
commit dd03076976
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configuration.c
View File

@ -57,7 +57,7 @@ void config_free(void)
configuration_settings = NULL; configuration_settings = NULL;
} }
static bool config_init(void) bool config_init(void)
{ {
configuration_settings = (settings_t*)calloc(1, sizeof(settings_t)); configuration_settings = (settings_t*)calloc(1, sizeof(settings_t));
@ -66,13 +66,6 @@ static bool config_init(void)
return true; return true;
} }
bool config_realloc(void)
{
config_free();
return config_init();
}
/** /**
* config_get_default_audio: * config_get_default_audio:
* *

2
configuration.h
View File

@ -560,7 +560,7 @@ bool config_save_autoconf_profile(const char *path, unsigned user);
**/ **/
bool config_save_file(const char *path); bool config_save_file(const char *path);
bool config_realloc(void); bool config_init(void);
void config_free(void); void config_free(void);

4
retroarch.c
View File

@ -1432,11 +1432,11 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
driver_ctl(RARCH_DRIVER_CTL_UNINIT_ALL, NULL); driver_ctl(RARCH_DRIVER_CTL_UNINIT_ALL, NULL);
break; break;
case RARCH_CTL_PREINIT: case RARCH_CTL_PREINIT:
if (!config_realloc())
return false;
command_event(CMD_EVENT_HISTORY_DEINIT, NULL); command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
config_init();
runloop_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL); runloop_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL);
break; break;
case RARCH_CTL_MAIN_DEINIT: case RARCH_CTL_MAIN_DEINIT: