From c1a0a8f84a5544fcade466d12f193cd8309641ca Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 23 Aug 2019 13:22:33 +0200 Subject: [PATCH] DolphinQt: Fix whitelisting USB devices Revert of https://github.com/dolphin-emu/dolphin/pull/8233#discussion_r306223322 --- .../Settings/USBDeviceAddToWhitelistDialog.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp index b51068ad25..ba531093f0 100644 --- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -4,8 +4,6 @@ #include "DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h" -#include - #include #include #include @@ -29,7 +27,7 @@ #include "UICommon/USBUtils.h" -static bool IsValidUSBIDString(std::string_view string) +static bool IsValidUSBIDString(const std::string& string) { if (string.empty() || string.length() > 4) return false; @@ -126,8 +124,8 @@ void USBDeviceAddToWhitelistDialog::RefreshDeviceList() void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() { - const std::string_view vid_string = StripSpaces(device_vid_textbox->text().toStdString()); - const std::string_view pid_string = StripSpaces(device_pid_textbox->text().toStdString()); + const std::string vid_string(StripSpaces(device_vid_textbox->text().toStdString())); + const std::string pid_string(StripSpaces(device_pid_textbox->text().toStdString())); if (!IsValidUSBIDString(vid_string)) { // i18n: Here, VID means Vendor ID (for a USB device). @@ -153,8 +151,8 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() return; } - const u16 vid = static_cast(std::stoul(std::string(vid_string), nullptr, 16)); - const u16 pid = static_cast(std::stoul(std::string(pid_string), nullptr, 16)); + const u16 vid = static_cast(std::stoul(vid_string, nullptr, 16)); + const u16 pid = static_cast(std::stoul(pid_string, nullptr, 16)); if (SConfig::GetInstance().IsUSBDeviceWhitelisted({vid, pid})) {