bugfix: store joystick GUID, use it to check before re-importing joys…

…ticks (#1355)
BlitterStudio · Jun 19, 2024 · 8bf3de7 · 8bf3de7
1 parent 89df389
commit 8bf3de7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
@@ -1344,13 +1344,17 @@ void handle_clipboard_update_event()
 	}
 }
 
-void handle_joy_device_event()
+void handle_joy_device_event(const int which, const bool removed)
 {
-	write_log("SDL2 Controller/Joystick added or removed, re-running import joysticks...\n");
-	if (inputdevice_devicechange(&currprefs))
+	const didata* existing_did = &di_joystick[which];
+	if (existing_did->guid == "" || removed)
 	{
-		import_joysticks();
-		joystick_refresh_needed = true;
+		write_log("SDL2 Controller/Joystick added or removed, re-running import joysticks...\n");
+		if (inputdevice_devicechange(&currprefs))
+		{
+			import_joysticks();
+			joystick_refresh_needed = true;
+		}
 	}
 }
 
@@ -1625,9 +1629,10 @@ void process_event(const SDL_Event& event)
 			break;
 
 		case SDL_JOYDEVICEADDED:
+			handle_joy_device_event(event.jdevice.which, false);
+			break;
 		case SDL_JOYDEVICEREMOVED:
-			// Disable this for now, as it forces a re-import of joysticks which will reset the controller mappings
-			//handle_joy_device_event();
+			handle_joy_device_event(0, true);
 			break;
 
 		case SDL_CONTROLLERBUTTONDOWN:

diff --git a/src/osdep/amiberry_input.cpp b/src/osdep/amiberry_input.cpp
@@ -836,6 +836,7 @@ void open_as_game_controller(struct didata* did, const int i)
 	did->joystick = SDL_GameControllerGetJoystick(did->controller);
 	did->joystick_id = SDL_JoystickInstanceID(did->joystick);
 	SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(did->joystick), guid_str, 33);
+	did->guid = std::string(guid_str);
 
 	if (SDL_GameControllerNameForIndex(i) != nullptr)
 		did->controller_name.assign(SDL_GameControllerNameForIndex(i));
@@ -865,6 +866,7 @@ void open_as_joystick(struct didata* did, const int i)
 	did->is_controller = false;
 	did->joystick_id = SDL_JoystickInstanceID(did->joystick);
 	SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(did->joystick), guid_str, 33);
+	did->guid = std::string(guid_str);
 
 	if (SDL_JoystickNameForIndex(i) != nullptr)
 		did->joystick_name.assign(SDL_JoystickNameForIndex(i));

diff --git a/src/osdep/amiberry_input.h b/src/osdep/amiberry_input.h
@@ -52,6 +52,7 @@ struct didata {
 	std::string controller_name{};
 	std::string joystick_name{};
 
+	std::string guid{};
 	bool is_controller{};
 	SDL_GameController* controller{};
 	SDL_Joystick* joystick{};

diff --git a/src/osdep/gui/main_window.cpp b/src/osdep/gui/main_window.cpp
@@ -422,6 +422,7 @@ void check_input()
 
 	auto got_event = 0;
 	didata* did = &di_joystick[0];
+	didata* existing_did = nullptr;
 
 	while (SDL_PollEvent(&gui_event))
 	{
@@ -437,10 +438,18 @@ void check_input()
 			break;
 
 		case SDL_JOYDEVICEADDED:
-		//case SDL_CONTROLLERDEVICEADDED:
+			// Check if we need to re-import joysticks
+			existing_did = &di_joystick[gui_event.jdevice.which];
+			if (existing_did->guid == "")
+			{
+				write_log("GUI: SDL2 Controller/Joystick added, re-running import joysticks...\n");
+				import_joysticks();
+				joystick_refresh_needed = true;
+				RefreshPanelInput();
+			}
+			return;
 		case SDL_JOYDEVICEREMOVED:
-		//case SDL_CONTROLLERDEVICEREMOVED:
-			write_log("GUI: SDL2 Controller/Joystick added or removed, re-running import joysticks...\n");
+			write_log("GUI: SDL2 Controller/Joystick removed, re-running import joysticks...\n");
 			if (inputdevice_devicechange(&currprefs))
 			{
 				import_joysticks();