diff options
author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-23 13:59:38 +0100 |
---|---|---|
committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-23 13:59:38 +0100 |
commit | 73f1340afb80f8749cb309b4ac89b9f13f4dff31 (patch) | |
tree | 160108811b81819928d41c0b2cb6498ae55374ba /src/skel | |
parent | Includes overhaul, fix some compiler warnings (diff) | |
download | re3-73f1340afb80f8749cb309b4ac89b9f13f4dff31.tar re3-73f1340afb80f8749cb309b4ac89b9f13f4dff31.tar.gz re3-73f1340afb80f8749cb309b4ac89b9f13f4dff31.tar.bz2 re3-73f1340afb80f8749cb309b4ac89b9f13f4dff31.tar.lz re3-73f1340afb80f8749cb309b4ac89b9f13f4dff31.tar.xz re3-73f1340afb80f8749cb309b4ac89b9f13f4dff31.tar.zst re3-73f1340afb80f8749cb309b4ac89b9f13f4dff31.zip |
Diffstat (limited to '')
-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 8c9289d2..a86ccaf8 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -1634,6 +1634,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(); @@ -1646,6 +1647,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 242a3fe2..02b3f917 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); |