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::enumerate_devices() { Timer timer; std::set device_paths; - std::map serials; + std::map serials; for (const auto& [vid, pid] : m_ids) { @@ -140,7 +140,7 @@ void hid_pad_handler::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::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 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 m_last_enumerated_devices; std::set m_new_enumerated_devices; - std::map m_enumerated_serials; + std::map m_enumerated_serials; std::mutex m_enumeration_mutex; std::unique_ptr>> m_enumeration_thread;