Merge pull request Electronicks#86 from TauAkiou/linux-build-invalid-…

…device-fix fix linux build (missing <cstring>) and fix invalid deviceHandles index
somebelse · Jan 30, 2023 · daf20a3 · daf20a3
2 parents df400c5 + 2a39f78
commit daf20a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/JoyShockMapper/src/Mapping.cpp b/JoyShockMapper/src/Mapping.cpp
@@ -1,6 +1,7 @@
 #include "Mapping.h"
 #include "InputHelpers.h"
 #include <regex>
+#include <cstring>
 
 ostream &operator<<(ostream &out, Mapping mapping)
 {

diff --git a/JoyShockMapper/src/SDL2Wrapper.cpp b/JoyShockMapper/src/SDL2Wrapper.cpp
@@ -317,6 +317,7 @@ struct SdlInstance : public JslWrapper
 			}
 			else
 			{
+                deviceHandleArray[i] = -1;
 				delete device;
 			}
 		}

diff --git a/JoyShockMapper/src/main.cpp b/JoyShockMapper/src/main.cpp
@@ -16,6 +16,7 @@
 #include <memory>
 #include <cfloat>
 #include <cuchar>
+#include <cstring>
 
 #ifdef _WIN32
 #include <shellapi.h>
@@ -1594,7 +1595,8 @@ void connectDevices(bool mergeJoycons = true)
 
 		if (numConnected < deviceHandles.size())
 		{
-			deviceHandles.resize(numConnected);
+            deviceHandles.erase(std::remove(deviceHandles.begin(), deviceHandles.end(), -1), deviceHandles.end());
+			//deviceHandles.resize(numConnected);
 		}
 
 		for (auto handle : deviceHandles) // Don't use foreach!
-Original file line number
+Diff line change
@@ Expand Up / @@ -317,6 +317,7 @@ struct SdlInstance : public JslWrapper @@
     			}
     			else
     			{
+                    deviceHandleArray[i] = -1;
     				delete device;
     			}
     		}
@@ Expand Down @@