From 2a39f788365fd5ad7dfcd6f49578e7b718384b23 Mon Sep 17 00:00:00 2001
From: TauAkiou <karaken@gmail.com>
Date: Sun, 29 Jan 2023 19:25:14 -0500
Subject: [PATCH] fix linux build (missing <cstring>) and fix invalid
 deviceHandles index

---
 JoyShockMapper/src/Mapping.cpp     | 1 +
 JoyShockMapper/src/SDL2Wrapper.cpp | 1 +
 JoyShockMapper/src/main.cpp        | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/JoyShockMapper/src/Mapping.cpp b/JoyShockMapper/src/Mapping.cpp
index 6395fd3..dc3b212 100644
--- 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
index 736d32b..70de621 100644
--- 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
index 7d00834..6c44c5c 100644
--- 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!