summaryrefslogtreecommitdiffhomepage
path: root/facetracknoir
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-26 08:34:10 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-26 08:34:10 +0200
commit2f631a5159542f7e2813ca6ed7bc0be37c50afae (patch)
tree9a6fb03ef47884bb02054643559922883ccd82b9 /facetracknoir
parent18085c6177dbbe440a12974d29fd03eb477ce177 (diff)
ui: also implicitly cancel options/mapping screens on normal close
Diffstat (limited to 'facetracknoir')
-rw-r--r--facetracknoir/curve-config.h1
-rw-r--r--facetracknoir/options-dialog.cpp1
-rw-r--r--facetracknoir/options-dialog.hpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/facetracknoir/curve-config.h b/facetracknoir/curve-config.h
index d1ef7ad2..0cbc7055 100644
--- a/facetracknoir/curve-config.h
+++ b/facetracknoir/curve-config.h
@@ -11,6 +11,7 @@ public:
private:
Ui::UICCurveConfigurationDialog ui;
Mappings& m;
+ void closeEvent(QCloseEvent *) override { doCancel(); }
private slots:
void doOK();
void doCancel();
diff --git a/facetracknoir/options-dialog.cpp b/facetracknoir/options-dialog.cpp
index b90408a8..1ec26d5e 100644
--- a/facetracknoir/options-dialog.cpp
+++ b/facetracknoir/options-dialog.cpp
@@ -91,3 +91,4 @@ void OptionsDialog::doCancel() {
ui.game_detector->revert();
close();
}
+
diff --git a/facetracknoir/options-dialog.hpp b/facetracknoir/options-dialog.hpp
index 9ad656a4..3ef99d06 100644
--- a/facetracknoir/options-dialog.hpp
+++ b/facetracknoir/options-dialog.hpp
@@ -15,6 +15,7 @@ public:
private:
Ui::UI_Settings ui;
Shortcuts::settings s;
+ void closeEvent(QCloseEvent *) override { doCancel(); }
private slots:
void doOK();
void doCancel();