From 44b20ee6fe2ef5197e822d9b43367e614057c46b Mon Sep 17 00:00:00 2001 From: Tigran Soghbatyan Date: Wed, 3 Nov 2021 16:36:03 +0100 Subject: [PATCH] [BH-1128] Fix return from alarm popups Prevent going back to previous alarm popup window --- .../BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp | 2 +- .../apps/common/src/popups/AlarmDeactivatedWindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp b/products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp index c4994826d0c2b0b87903f3abb0998067d0d85461..bde65c3d7b32c6377ac88a28e5feb6c814215ad1 100644 --- a/products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp +++ b/products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp @@ -63,7 +63,7 @@ namespace gui app::manager::actions::AbortPopup, std::make_unique(gui::popup::ID::AlarmDeactivated)); - if (application->getPrevWindow() == gui::window::name::bellAlarmSet) { + if (application->getPrevWindow() == popup::window::alarm_deactivated_window) { app::manager::Controller::sendAction( application, app::manager::actions::Launch, diff --git a/products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp b/products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp index 1060588d6cca3fe08f198b265970e4944b262bb2..c5673d3a7f8ea8b5040d1f5443e7d418d4c2a6ba 100644 --- a/products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp +++ b/products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp @@ -65,7 +65,7 @@ namespace gui app::manager::actions::AbortPopup, std::make_unique(gui::popup::ID::AlarmActivated)); - if (application->getPrevWindow() == gui::window::name::bellAlarmSet) { + if (application->getPrevWindow() == popup::window::alarm_activated_window) { app::manager::Controller::sendAction( application, app::manager::actions::Launch,