Skip to content
Permalink
Browse files

Merge pull request #8327 from JosJuice/more-string-view-regression

DolphinQt: Fix whitelisting USB devices
  • Loading branch information...
stenzek committed Aug 23, 2019
2 parents 3848f6d + c1a0a8f commit 88522b7a26bf189dc8122a1b951f2a76eec77c86
Showing with 5 additions and 7 deletions.
  1. +5 −7 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}))
{

0 comments on commit 88522b7

Please sign in to comment.
You can’t perform that action at this time.