From ec8cb1668c2f0f0bc6e8c93b5fcd6f8a82bf4833 Mon Sep 17 00:00:00 2001
From: RipleyTom <RipleyTom@users.noreply.github.com>
Date: Fri, 10 Mar 2023 14:05:08 +0100
Subject: [PATCH] Fix hid_pad_handler

---
 rpcs3/Input/hid_pad_handler.cpp | 6 +++---
 rpcs3/Input/hid_pad_handler.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp
index 22498714eb..7c7354dbbd 100644
--- a/rpcs3/Input/hid_pad_handler.cpp
+++ b/rpcs3/Input/hid_pad_handler.cpp
@@ -126,7 +126,7 @@ void hid_pad_handler<Device>::enumerate_devices()
 {
 	Timer timer;
 	std::set<std::string> device_paths;
-	std::map<std::string, std::wstring_view> serials;
+	std::map<std::string, std::wstring> serials;
 
 	for (const auto& [vid, pid] : m_ids)
 	{
@@ -140,7 +140,7 @@ void hid_pad_handler<Device>::enumerate_devices()
 				continue;
 			}
 			device_paths.insert(dev_info->path);
-			serials[dev_info->path] = dev_info->serial_number ? std::wstring_view(dev_info->serial_number) : std::wstring_view{};
+			serials[dev_info->path] = dev_info->serial_number ? std::wstring(dev_info->serial_number) : std::wstring();
 			dev_info                = dev_info->next;
 		}
 		hid_free_enumeration(head);
@@ -149,7 +149,7 @@ void hid_pad_handler<Device>::enumerate_devices()
 
 	std::lock_guard lock(m_enumeration_mutex);
 	m_new_enumerated_devices = device_paths;
-	m_enumerated_serials = serials;
+	m_enumerated_serials = std::move(serials);
 }
 
 template <class Device>
diff --git a/rpcs3/Input/hid_pad_handler.h b/rpcs3/Input/hid_pad_handler.h
index b89a33e743..943b6c2435 100644
--- a/rpcs3/Input/hid_pad_handler.h
+++ b/rpcs3/Input/hid_pad_handler.h
@@ -78,7 +78,7 @@ protected:
 
 	std::set<std::string> m_last_enumerated_devices;
 	std::set<std::string> m_new_enumerated_devices;
-	std::map<std::string, std::wstring_view> m_enumerated_serials;
+	std::map<std::string, std::wstring> m_enumerated_serials;
 	std::mutex m_enumeration_mutex;
 	std::unique_ptr<named_thread<std::function<void()>>> m_enumeration_thread;