summaryrefslogtreecommitdiffhomepage
path: root/gui/options-dialog.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-17 22:10:35 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-17 22:32:04 +0200
commit2eafc288d95d750f3a8282ebb503a340cb50a32c (patch)
tree7877d6c20c8cf31121710d0f76c919787f973df3 /gui/options-dialog.cpp
parentfdef1901054e61e5996c59ac09d9a2646cc76341 (diff)
gui: reload keybindings immediately
Previously the old global keybindings stuck when options dialog got cancelled.
Diffstat (limited to 'gui/options-dialog.cpp')
-rw-r--r--gui/options-dialog.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp
index c6e6dd97..3f051c9f 100644
--- a/gui/options-dialog.cpp
+++ b/gui/options-dialog.cpp
@@ -147,7 +147,7 @@ void OptionsDialog::bind_key(key_opts& kopts, QLabel* label)
d.close();
}
});
- connect(main.b.get(), &options::detail::opt_bundle::reloading, &d, &QDialog::close);
+ connect(main.b.get(), &options::detail::bundle::reloading, &d, &QDialog::close);
pause_keybindings(true);
d.show();
d.exec();
@@ -160,7 +160,7 @@ void OptionsDialog::doOK()
main.b->save();
ui.game_detector->save();
close();
- emit saving();
+ emit closing();
}
void OptionsDialog::doCancel()
@@ -168,6 +168,7 @@ void OptionsDialog::doCancel()
main.b->reload();
ui.game_detector->revert();
close();
+ emit closing();
}
void OptionsDialog::browse_datalogging_file()