From fd52285074ca6b1eb4a0b3b7990358ab08b837f4 Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Sun, 15 Aug 2021 03:29:49 +0300
Subject: [PATCH] Fix premature .ini saving leading to missing bindings

---
 src/core/Frontend.cpp |  3 ---
 src/skel/win/win.cpp  | 10 ++++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 4820427f..875bb76b 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3169,9 +3169,6 @@ CMenuManager::LoadSettings()
 	if (LoadINISettings()) {
 		LoadINIControllerSettings();
 	}
-	// if no reVC.ini, create it, or update it with new values
-	SaveINISettings();
-	SaveINIControllerSettings();
 #endif
 
 #ifdef FIX_BUGS
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index f251f58d..c49f0ab9 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -2179,10 +2179,12 @@ WinMain(HINSTANCE instance,
 
 #ifdef LOAD_INI_SETTINGS
 		LoadINIControllerSettings();
-		if (connectedPadButtons != 0) {
-			ControlsManager.InitDefaultControlConfigJoyPad(connectedPadButtons);
-			SaveINIControllerSettings();
-		}
+		if (connectedPadButtons != 0)
+			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();
 #endif
 	}