diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-15 02:40:34 +0100 |
|---|---|---|
| committer | shfil <filip.gawin@zoho.com> | 2021-01-17 21:33:53 +0100 |
| commit | 448e41ecaa66483c4cf764fdeb66a857a42719cf (patch) | |
| tree | 15074cca348cdfcb33e45ecf3ae011dea6f68953 /src/skel | |
| parent | Includes overhaul, fix some compiler warnings (diff) | |
| download | re3-448e41ecaa66483c4cf764fdeb66a857a42719cf.tar re3-448e41ecaa66483c4cf764fdeb66a857a42719cf.tar.gz re3-448e41ecaa66483c4cf764fdeb66a857a42719cf.tar.bz2 re3-448e41ecaa66483c4cf764fdeb66a857a42719cf.tar.lz re3-448e41ecaa66483c4cf764fdeb66a857a42719cf.tar.xz re3-448e41ecaa66483c4cf764fdeb66a857a42719cf.tar.zst re3-448e41ecaa66483c4cf764fdeb66a857a42719cf.zip | |
Diffstat (limited to 'src/skel')
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 5 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index 683407aa..5f87d600 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -1598,6 +1598,7 @@ main(int argc, char *argv[]) SystemParametersInfo(SPI_SETSTICKYKEYS, sizeof(STICKYKEYS), &NewStickyKeys, SPIF_SENDCHANGE); #endif + // This part is needed because controller initialisation overwrites loaded settings. { CFileMgr::SetDirMyDocuments(); @@ -1610,6 +1611,10 @@ main(int argc, char *argv[]) } CFileMgr::SetDir(""); + +#ifdef LOAD_INI_SETTINGS + LoadINIControllerSettings(); +#endif } #ifdef _WIN32 diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index d373a8b5..5a0c7db2 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -2142,6 +2142,7 @@ WinMain(HINSTANCE instance, ShowWindow(PSGLOBAL(window), cmdShow); UpdateWindow(PSGLOBAL(window)); + // This part is needed because controller initialisation overwrites loaded settings. { CFileMgr::SetDirMyDocuments(); @@ -2154,6 +2155,10 @@ WinMain(HINSTANCE instance, } CFileMgr::SetDir(""); + +#ifdef LOAD_INI_SETTINGS + LoadINIControllerSettings(); +#endif } SetErrorMode(SEM_FAILCRITICALERRORS); |