mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-11-22 09:09:15 +01:00
Fix premature .ini saving leading to missing bindings
This commit is contained in:
parent
df89e5091e
commit
747ae04279
@ -3812,9 +3812,6 @@ CMenuManager::LoadSettings()
|
|||||||
if (LoadINISettings()) {
|
if (LoadINISettings()) {
|
||||||
LoadINIControllerSettings();
|
LoadINIControllerSettings();
|
||||||
}
|
}
|
||||||
// if no re3.ini, create it, or update it with new values
|
|
||||||
SaveINISettings();
|
|
||||||
SaveINIControllerSettings();
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
m_PrefsVsync = m_PrefsVsyncDisp;
|
m_PrefsVsync = m_PrefsVsyncDisp;
|
||||||
|
@ -1935,10 +1935,12 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
#ifdef LOAD_INI_SETTINGS
|
#ifdef LOAD_INI_SETTINGS
|
||||||
LoadINIControllerSettings();
|
LoadINIControllerSettings();
|
||||||
if (connectedPadButtons != 0) {
|
if (connectedPadButtons != 0)
|
||||||
ControlsManager.InitDefaultControlConfigJoyPad(connectedPadButtons);
|
ControlsManager.InitDefaultControlConfigJoyPad(connectedPadButtons); // add (connected-saved) amount of new button assignments on top of ours
|
||||||
SaveINIControllerSettings();
|
|
||||||
}
|
// these have 2 purposes: creating .ini at the start, and adding newly introduced settings to old .ini at the start
|
||||||
|
SaveINISettings();
|
||||||
|
SaveINIControllerSettings();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2181,10 +2181,12 @@ WinMain(HINSTANCE instance,
|
|||||||
|
|
||||||
#ifdef LOAD_INI_SETTINGS
|
#ifdef LOAD_INI_SETTINGS
|
||||||
LoadINIControllerSettings();
|
LoadINIControllerSettings();
|
||||||
if (connectedPadButtons != 0) {
|
if (connectedPadButtons != 0)
|
||||||
ControlsManager.InitDefaultControlConfigJoyPad(connectedPadButtons);
|
ControlsManager.InitDefaultControlConfigJoyPad(connectedPadButtons); // add (connected-saved) amount of new button assignments on top of ours
|
||||||
SaveINIControllerSettings();
|
|
||||||
}
|
// these have 2 purposes: creating .ini at the start, and adding newly introduced settings to old .ini at the start
|
||||||
|
SaveINISettings();
|
||||||
|
SaveINIControllerSettings();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user