~aleteoryx/muditaos: [EGD-7105] Fix window with timeout

14b1675732a809b66d6a032a5facba0293cf5742 — Wojtek Rzepecki 4 years ago 667ba85

[EGD-7105] Fix window with timeout

Fix window whith timeout to prevent
recursive returns to previous window

patch browse .tar.gz

2 files changed, 6 insertions(+), 0 deletions(-)

M module-apps/apps-common/popups/WindowWithTimer.cpp
M module-apps/apps-common/popups/WindowWithTimer.hpp

M module-apps/apps-common/popups/WindowWithTimer.cpp => module-apps/apps-common/popups/WindowWithTimer.cpp +5 -0

@@ 52,6 52,11 @@ namespace gui
         resetTimer();
     }
 
+    void WindowWithTimer::onClose()
+    {
+        detachTimerIfExists();
+    }
+
     WindowWithTimer::~WindowWithTimer()
     {
         destroyInterface();

M module-apps/apps-common/popups/WindowWithTimer.hpp => module-apps/apps-common/popups/WindowWithTimer.hpp +1 -0

@@ 22,6 22,7 @@ namespace gui
         void destroyInterface() override;
         ~WindowWithTimer() override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
+        void onClose() override;
         bool onInput(const gui::InputEvent &inputEvent) override;
 
       protected: