fix possible duplication of newly added joysticks

notimaginative · notimaginative · commit 92cc8bb03dfd · 2025-11-29T09:06:53.000-05:00
diff --git a/code/io/joy-sdl.cpp b/code/io/joy-sdl.cpp
@@ -483,7 +483,8 @@ bool device_event_handler(const SDL_Event &evt)
 
 			for (auto iter = joysticks.begin(); iter != joysticks.end(); ++iter)
 			{
-				if ((*iter)->getID() == added->getID())
+				// must use GUID here as joystick IDs are never reused
+				if ((*iter)->getGUID() == added->getGUID())
 				{
 					// Already have this stick
 					*(*iter) = std::move(*added);

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,8 @@ bool device_event_handler(const SDL_Event &evt)`
`483`	`483`
`484`	`484`	`for (auto iter = joysticks.begin(); iter != joysticks.end(); ++iter)`
`485`	`485`	`{`
`486`		`- if ((*iter)->getID() == added->getID())`
	`486`	`+ // must use GUID here as joystick IDs are never reused`
	`487`	`+ if ((*iter)->getGUID() == added->getGUID())`
`487`	`488`	`{`
`488`	`489`	`// Already have this stick`
`489`	`490`	`(iter) = std::move(*added);`