1 files changed, 39 insertions, 5 deletions

diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 069320ec..a06762f5 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -33,6 +33,11 @@
 #include "postfx.h"
 #include "custompipes.h"
 
+#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
+#include "FileMgr.h"
+#include "ControllerConfig.h"
+#endif
+
 #ifndef _WIN32
 #include "assert.h"
 #include <stdarg.h>
@@ -275,7 +280,7 @@ wchar* DetectJoystickDraw(bool* disabled, bool userHovering) {
 	const char *joyname;
 	if (userHovering) {
 		for (int i = 0; i <= GLFW_JOYSTICK_LAST; i++) {
-			if (joyname = glfwGetJoystickName(i)) {
+			if ((joyname = glfwGetJoystickName(i))) {
 				const uint8* buttons = glfwGetJoystickButtons(i, &numButtons);
 				for (int j = 0; j < numButtons; j++) {
 					if (buttons[j]) {
@@ -455,8 +460,34 @@ void LoadINISettings()
 	char defaultStr[4];
 
 #ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
+	// Written by assuming the codes below will run after _InputInitialiseJoys().
 	strcpy(gSelectedJoystickName, cfg.get("DetectJoystick", "JoystickName", "").c_str());
-	_InputInitialiseJoys();
+	
+	if(gSelectedJoystickName[0] != '\0') {
+		for (int i = 0; i <= GLFW_JOYSTICK_LAST; i++) {
+			if (glfwJoystickPresent(i) && strncmp(gSelectedJoystickName, glfwGetJoystickName(i), strlen(gSelectedJoystickName)) == 0) {
+				if (PSGLOBAL(joy1id) != -1) {
+					PSGLOBAL(joy2id) = PSGLOBAL(joy1id);
+				}
+				PSGLOBAL(joy1id) = i;
+				int count;
+				glfwGetJoystickButtons(PSGLOBAL(joy1id), &count);
+				
+				// We need to init and reload bindings, because;
+				//	1-joypad button number may differ with saved/prvly connected one
+				//	2-bindings are not init'ed if there is no joypad at the start
+				ControlsManager.InitDefaultControlConfigJoyPad(count);
+				CFileMgr::SetDirMyDocuments();
+				int32 gta3set = CFileMgr::OpenFile("gta3.set", "r");
+				if (gta3set) {
+					ControlsManager.LoadSettings(gta3set);
+					CFileMgr::CloseFile(gta3set);
+				}
+				CFileMgr::SetDir("");
+				break;
+			}
+		}
+	}
 #endif
 
 #ifdef CUSTOM_FRONTEND_OPTIONS
@@ -818,9 +849,12 @@ DebugMenuPopulate(void)
 		DebugMenuEntrySetWrap(e, true);
 		DebugMenuAddVar("Render", "Neo Vehicle Shininess", &CustomPipes::VehicleShininess, nil, 0.1f, 0, 1.0f);
 		DebugMenuAddVar("Render", "Neo Vehicle Specularity", &CustomPipes::VehicleSpecularity, nil, 0.1f, 0, 1.0f);
-		DebugMenuAddVar("Render", "Neo Ped Rim light", &CustomPipes::RimlightMult, nil, 0.1f, 0, 1.0f);
-		DebugMenuAddVar("Render", "Neo World Lightmaps", &CustomPipes::LightmapMult, nil, 0.1f, 0, 1.0f);
-		DebugMenuAddVar("Render", "Neo Road Gloss", &CustomPipes::GlossMult, nil, 0.1f, 0, 1.0f);
+		DebugMenuAddVarBool8("Render", "Neo Ped Rim light enable", &CustomPipes::RimlightEnable, nil);
+		DebugMenuAddVar("Render", "Mult", &CustomPipes::RimlightMult, nil, 0.1f, 0, 1.0f);
+		DebugMenuAddVarBool8("Render", "Neo World Lightmaps enable", &CustomPipes::LightmapEnable, nil);
+		DebugMenuAddVar("Render", "Mult", &CustomPipes::LightmapMult, nil, 0.1f, 0, 1.0f);
+		DebugMenuAddVarBool8("Render", "Neo Road Gloss enable", &CustomPipes::GlossEnable, nil);
+		DebugMenuAddVar("Render", "Mult", &CustomPipes::GlossMult, nil, 0.1f, 0, 1.0f);
 #endif
 		DebugMenuAddVarBool8("Render", "Show Ped Paths", &gbShowPedPaths, nil);
 		DebugMenuAddVarBool8("Render", "Show Car Paths", &gbShowCarPaths, nil);