mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed control changes not being persisted

Browse source 
caused by fix for bootlogo option not being observed (moved Config_read to before the core reports its default input mapping which then overwrote the loaded configs)
This commit is contained in:
Shaun Inman 2023-03-05 08:14:23 -05:00
parent f6be23fbaf
commit be39895c7a
1 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/minarch/main.c
View file

@ -875,20 +875,7 @@ static void Config_getPath(char* filename, int override) {
if (override) sprintf(filename, "%s/%s.cfg", core.config_dir, game.name); if (override) sprintf(filename, "%s/%s.cfg", core.config_dir, game.name);
else sprintf(filename, "%s/minarch.cfg", core.config_dir); else sprintf(filename, "%s/minarch.cfg", core.config_dir);
} }
static void Config_read(void) { static void Config_readOptions(char* cfg) {
char path[MAX_PATH];
config.loaded = CONFIG_NONE;
int override = 0;
Config_getPath(path, CONFIG_WRITE_GAME);
if (exists(path)) override = 1;
if (!override) Config_getPath(path, CONFIG_WRITE_ALL);
char* cfg = allocFile(path);
if (!cfg) return;
config.loaded = override ? CONFIG_GAME : CONFIG_CONSOLE;
char key[256]; char key[256];
char value[256]; char value[256];
for (int i=0; config.frontend.options[i].key; i++) { for (int i=0; config.frontend.options[i].key; i++) {
@ -905,7 +892,10 @@ static void Config_read(void) {
// TODO: handle not finding the expected value // TODO: handle not finding the expected value
OptionList_setOptionValue(&config.core, option->key, value); OptionList_setOptionValue(&config.core, option->key, value);
} }
}
static void Config_readControls(char* cfg) {
char key[256];
char value[256];
for (int i=0; config.controls[i].name; i++) { for (int i=0; config.controls[i].name; i++) {
ButtonMapping* mapping = &config.controls[i]; ButtonMapping* mapping = &config.controls[i];
sprintf(key, "bind %s", mapping->name); sprintf(key, "bind %s", mapping->name);
@ -944,8 +934,22 @@ static void Config_read(void) {
mapping->local = id; mapping->local = id;
mapping->mod = mod; mapping->mod = mod;
} }
}
static char* Config_load(void) {
char path[MAX_PATH];
config.loaded = CONFIG_NONE;
free(cfg); int override = 0;
Config_getPath(path, CONFIG_WRITE_GAME);
if (exists(path)) override = 1;
if (!override) Config_getPath(path, CONFIG_WRITE_ALL);
char* cfg = allocFile(path);
if (!cfg) return NULL;
config.loaded = override ? CONFIG_GAME : CONFIG_CONSOLE;
return cfg;
} }
static void Config_write(int override) { static void Config_write(int override) {
char path[MAX_PATH]; char path[MAX_PATH];
@ -1019,7 +1023,10 @@ static void Config_restore(void) {
mapping->mod = 0; mapping->mod = 0;
} }
Config_read(); char* cfg = Config_load();
Config_readOptions(cfg);
Config_readControls(cfg);
free(cfg);
renderer.src_w = 0; renderer.src_w = 0;
} }
@ -4244,8 +4251,9 @@ int main(int argc , char* argv[]) {
Game_open(rom_path); Game_open(rom_path);
if (!game.is_open) goto finish; if (!game.is_open) goto finish;
// restore configs // restore options
Config_read(); char* cfg = Config_load();
Config_readOptions(cfg);
setOverclock(overclock); setOverclock(overclock);
GFX_setVsync(prevent_tearing); GFX_setVsync(prevent_tearing);
@ -4256,6 +4264,9 @@ int main(int argc , char* argv[]) {
options_menu.items[1].desc = (char*)core.version; options_menu.items[1].desc = (char*)core.version;
Core_load(); Core_load();
// restore controls (after the core has reported its defaults)
Config_readControls(cfg);
free(cfg);
Input_init(NULL); Input_init(NULL);
SND_init(core.sample_rate, core.fps); SND_init(core.sample_rate, core.fps);