diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-04-01 15:49:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-01 15:49:08 +0200 |
commit | b2772bcb0d994a9646282e98aca5d97b70f843f4 (patch) | |
tree | d2a1f4b3990c946d63652c23361174a33cd3e782 /src/yuzu/main.cpp | |
parent | Merge pull request #9999 from german77/new_hid_hurra (diff) | |
parent | applet: controller: Implement cancel button (diff) | |
download | yuzu-b2772bcb0d994a9646282e98aca5d97b70f843f4.tar yuzu-b2772bcb0d994a9646282e98aca5d97b70f843f4.tar.gz yuzu-b2772bcb0d994a9646282e98aca5d97b70f843f4.tar.bz2 yuzu-b2772bcb0d994a9646282e98aca5d97b70f843f4.tar.lz yuzu-b2772bcb0d994a9646282e98aca5d97b70f843f4.tar.xz yuzu-b2772bcb0d994a9646282e98aca5d97b70f843f4.tar.zst yuzu-b2772bcb0d994a9646282e98aca5d97b70f843f4.zip |
Diffstat (limited to 'src/yuzu/main.cpp')
-rw-r--r-- | src/yuzu/main.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 0c60a90cb..2ebfef551 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -634,15 +634,16 @@ void GMainWindow::ControllerSelectorReconfigureControllers( Qt::WindowStaysOnTopHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint); controller_applet->setWindowModality(Qt::WindowModal); - controller_applet->exec(); - - emit ControllerSelectorReconfigureFinished(); + bool is_success = controller_applet->exec() != QDialog::Rejected; // Don't forget to apply settings. + system->HIDCore().DisableAllControllerConfiguration(); system->ApplySettings(); config->Save(); UpdateStatusButtons(); + + emit ControllerSelectorReconfigureFinished(is_success); } void GMainWindow::ControllerSelectorRequestExit() { |