From 1b3284042446551f6ff5a2c723957056131f5f31 Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Fri, 22 Jan 2021 23:40:28 +0300
Subject: No more resetting bindings for joypad, create .ini at the first
 start, joystick hotplug for Linux

---
 src/core/Frontend.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/core/Frontend.cpp')

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 12e4b16a..0a9db5a4 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3045,8 +3045,13 @@ CMenuManager::LoadSettings()
 	CFileMgr::SetDir("");
 
 #ifdef LOAD_INI_SETTINGS
-	LoadINISettings();
-	LoadINIControllerSettings(); // Calling that after LoadINISettings is important because of gSelectedJoystickName loading
+	if (LoadINISettings()) {
+		LoadINIControllerSettings();
+	} else {
+		// no re3.ini, create it
+		SaveINISettings();
+		SaveINIControllerSettings();
+	}
 #endif
 
 #ifdef FIX_BUGS
@@ -3160,12 +3165,6 @@ CMenuManager::SaveSettings()
 	
 #else
 	m_lastWorking3DAudioProvider = m_nPrefsAudio3DProviderIndex;
-	static bool firstTime = true;
-	// In other conditions we already call SaveINIControllerSettings explicitly.
-	if (firstTime) {
-		SaveINIControllerSettings();
-		firstTime = false;
-	}
 	SaveINISettings();
 #endif
 }
@@ -5450,6 +5449,9 @@ CMenuManager::SwitchMenuOnAndOff()
 				ThingsToDoBeforeLeavingPage();
 #endif
 				SaveSettings();
+#ifdef LOAD_INI_SETTINGS
+				SaveINIControllerSettings();
+#endif
 				pControlEdit = nil;
 				pEditString = nil;
 				DisplayComboButtonErrMsg = false;
-- 
cgit v1.2.3