~aleteoryx/muditaos: [BH-1490] Prevent double deeppress from causing back behaviour

2 files changed, 3 insertions(+), 7 deletions(-)

M products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp
M products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp

M products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp => products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp +1 -4

@@ 62,10 62,7 @@ namespace gui
 
     void AlarmActivatedWindow::returnToPreviousWindow()
     {
-        app::manager::Controller::sendAction(
-            application,
-            app::manager::actions::AbortPopup,
-            std::make_unique<gui::PopupRequestParams>(gui::popup::ID::AlarmDeactivated));
+        application->windowsStack().pop(popup::window::alarm_deactivated_window);
 
         if (application->windowsStack().pop(gui::window::name::bellAlarmSet)) {
             app::manager::Controller::sendAction(

M products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp => products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp +2 -3

@@ 65,9 65,8 @@ namespace gui
 
     void AlarmDeactivatedWindow::returnToPreviousWindow()
     {
-        app::manager::Controller::sendAction(application,
-                                             app::manager::actions::AbortPopup,
-                                             std::make_unique<gui::PopupRequestParams>(gui::popup::ID::AlarmActivated));
+        application->windowsStack().pop(popup::window::alarm_activated_window);
+
         if (application->windowsStack().pop(gui::window::name::bellAlarmSet)) {
             app::manager::Controller::sendAction(
                 application,