summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-12-31 02:36:41 +0100
committerGitHub <noreply@github.com>2021-12-31 02:36:41 +0100
commitdf0870f79d28806886df50d5245c85997fb72b1f (patch)
tree87a460aa02c01d4a5e23832f1eab934e89860d1e /Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
parent1af0c5f89ff14cd401574de83ac3d2f225368951 (diff)
parent247f5d823fb68be1f6ce33453585f1a5d4046482 (diff)
Merge pull request #10327 from AdmiralCurtiss/config-port-usb
Config: Port USBPassthrough setting to new config system.
Diffstat (limited to 'Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp')
-rw-r--r--Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
index 3fab4f4834..d2272d03b0 100644
--- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
+++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
@@ -19,6 +19,7 @@
#include "Common/StringUtil.h"
+#include "Core/Config/MainSettings.h"
#include "Core/ConfigManager.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h"
@@ -109,9 +110,10 @@ void USBDeviceAddToWhitelistDialog::RefreshDeviceList()
return;
const auto selection_string = usb_inserted_devices_list->currentItem();
usb_inserted_devices_list->clear();
+ auto whitelist = Config::GetUSBDeviceWhitelist();
for (const auto& device : current_devices)
{
- if (SConfig::GetInstance().IsUSBDeviceWhitelisted(device.first))
+ if (whitelist.count({device.first.first, device.first.second}) != 0)
continue;
usb_inserted_devices_list->addItem(QString::fromStdString(device.second));
}
@@ -141,14 +143,16 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist()
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}))
+ auto whitelist = Config::GetUSBDeviceWhitelist();
+ auto it = whitelist.emplace(vid, pid);
+ if (!it.second)
{
ModalMessageBox::critical(this, tr("USB Whitelist Error"),
tr("This USB device is already whitelisted."));
return;
}
- SConfig::GetInstance().m_usb_passthrough_devices.emplace(vid, pid);
- SConfig::GetInstance().SaveSettings();
+ Config::SetUSBDeviceWhitelist(whitelist);
+ Config::Save();
accept();
}