diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2019-08-23 21:32:13 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 21:32:13 +1000 |
| commit | 88522b7a26bf189dc8122a1b951f2a76eec77c86 (patch) | |
| tree | be5709a53c62bf843ba8f8fd7eae9dda272a9faf /Source/Core | |
| parent | 3848f6d9ecbc590a1f81295d5a538b573acac114 (diff) | |
| parent | c1a0a8f84a5544fcade466d12f193cd8309641ca (diff) | |
Merge pull request #8327 from JosJuice/more-string-view-regression
DolphinQt: Fix whitelisting USB devices
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp | 12 |
1 files 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 <string_view> - #include <QButtonGroup> #include <QDialog> #include <QDialogButtonBox> @@ -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<u16>(std::stoul(std::string(vid_string), nullptr, 16)); - const u16 pid = static_cast<u16>(std::stoul(std::string(pid_string), nullptr, 16)); + const u16 vid = static_cast<u16>(std::stoul(vid_string, nullptr, 16)); + const u16 pid = static_cast<u16>(std::stoul(pid_string, nullptr, 16)); if (SConfig::GetInstance().IsUSBDeviceWhitelisted({vid, pid})) { |