summaryrefslogtreecommitdiff
path: root/src/skel
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-01-15 04:40:34 +0300
committershfil <filip.gawin@zoho.com>2021-01-17 21:33:53 +0100
commit448e41ecaa66483c4cf764fdeb66a857a42719cf (patch)
tree15074cca348cdfcb33e45ecf3ae011dea6f68953 /src/skel
parent5a47379bf5f011a65c1d0f88a0cb5f2130feb9db (diff)
Store all settings in .INI
Diffstat (limited to 'src/skel')
-rw-r--r--src/skel/glfw/glfw.cpp5
-rw-r--r--src/skel/win/win.cpp5
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);