diff options
| author | Tilka <tilkax@gmail.com> | 2018-10-14 01:13:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 01:13:35 +0100 |
| commit | 9a1f2596267ab95dabccaaba80bbe4cbe96ec697 (patch) | |
| tree | 77bc446c2be69252b565d40f8c44e8db0dc78826 /Source/Core | |
| parent | 1abb27909d69b57fffb5782d2ce98dca88ea1fc0 (diff) | |
| parent | 3dec84a91b00b50c3d07c0eb68238173bd11cdd1 (diff) | |
Merge pull request #7486 from amaiorano/fix-infinite-polling-for-usb-devices
Fix infinite polling for usb devices after the "add to whitelist" dia…
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/Settings/WiiPane.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/Settings/WiiPane.cpp b/Source/Core/DolphinQt/Settings/WiiPane.cpp index 8865686f82..6d2eced4cb 100644 --- a/Source/Core/DolphinQt/Settings/WiiPane.cpp +++ b/Source/Core/DolphinQt/Settings/WiiPane.cpp @@ -249,11 +249,10 @@ void WiiPane::ValidateSelectionState() void WiiPane::OnUSBWhitelistAddButton() { - USBDeviceAddToWhitelistDialog* usb_whitelist_dialog = new USBDeviceAddToWhitelistDialog(this); - connect(usb_whitelist_dialog, &USBDeviceAddToWhitelistDialog::accepted, this, + USBDeviceAddToWhitelistDialog usb_whitelist_dialog(this); + connect(&usb_whitelist_dialog, &USBDeviceAddToWhitelistDialog::accepted, this, &WiiPane::PopulateUSBPassthroughListWidget); - usb_whitelist_dialog->setModal(true); - usb_whitelist_dialog->show(); + usb_whitelist_dialog.exec(); } void WiiPane::OnUSBWhitelistRemoveButton() |