From 6a9d7710416bc849a4807b08a0575e28e236da98 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Fri, 29 Jan 2021 22:07:54 +0100
Subject: [PATCH] wiiu: fix settings saving

---
 src/skel/wiiu/wiiu.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/skel/wiiu/wiiu.cpp b/src/skel/wiiu/wiiu.cpp
index 0a6e4c63..0359b669 100644
--- a/src/skel/wiiu/wiiu.cpp
+++ b/src/skel/wiiu/wiiu.cpp
@@ -288,7 +288,7 @@ psInitialize(void)
 
 #ifndef PS2_MENU
 
-#if GTA_VERSION < GTA3_PC_11
+#if GTA_VERSION >= GTA3_PC_11
 	FrontEndMenuManager.LoadSettings();
 #endif
 
@@ -931,6 +931,13 @@ main(int argc, char *argv[])
 	{
 		CFileMgr::SetDirMyDocuments();
 		
+#ifdef LOAD_INI_SETTINGS
+		// At this point InitDefaultControlConfigJoyPad must have set all bindings to default and ms_padButtonsInited to number of detected buttons.
+		// We will load stored bindings below, but let's cache ms_padButtonsInited before LoadINIControllerSettings and LoadSettings clears it,
+		// so we can add new joy bindings **on top of** stored bindings.
+		int connectedPadButtons = ControlsManager.ms_padButtonsInited;
+#endif
+
 		int32 gta3set = CFileMgr::OpenFile("gta3.set", "r");
 		
 		if ( gta3set )
@@ -940,6 +947,14 @@ main(int argc, char *argv[])
 		}
 		
 		CFileMgr::SetDir("");
+
+#ifdef LOAD_INI_SETTINGS
+		LoadINIControllerSettings();
+		if (connectedPadButtons != 0) {
+			ControlsManager.InitDefaultControlConfigJoyPad(connectedPadButtons);
+			SaveINIControllerSettings();
+		}
+#endif
 	}