mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-25 13:13:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix premature .ini saving leading to missing bindings

Browse source
This commit is contained in:
erorcun 2021-08-15 03:29:49 +03:00
parent df89e5091e
commit 747ae04279
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/Frontend.cpp
View file

@ -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;

8
src/skel/glfw/glfw.cpp
View file

@ -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
// these have 2 purposes: creating .ini at the start, and adding newly introduced settings to old .ini at the start
SaveINISettings();
SaveINIControllerSettings(); SaveINIControllerSettings();
}
#endif #endif
} }

8
src/skel/win/win.cpp
View file

@ -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
// these have 2 purposes: creating .ini at the start, and adding newly introduced settings to old .ini at the start
SaveINISettings();
SaveINIControllerSettings(); SaveINIControllerSettings();
}
#endif #endif
} }