From 2f631a5159542f7e2813ca6ed7bc0be37c50afae Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 26 Jul 2015 08:34:10 +0200
Subject: ui: also implicitly cancel options/mapping screens on normal close

---
 facetracknoir/curve-config.h     | 1 +
 facetracknoir/options-dialog.cpp | 1 +
 facetracknoir/options-dialog.hpp | 1 +
 3 files changed, 3 insertions(+)

(limited to 'facetracknoir')

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();
-- 
cgit v1.2.3