~aleteoryx/muditaos

44b20ee6fe2ef5197e822d9b43367e614057c46b — Tigran Soghbatyan 4 years ago a2b6d87
[BH-1128] Fix return from alarm popups

Prevent going back to previous alarm popup window
M products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp => products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp +1 -1
@@ 63,7 63,7 @@ namespace gui
            app::manager::actions::AbortPopup,
            std::make_unique<gui::PopupRequestParams>(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,

M products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp => products/BellHybrid/apps/common/src/popups/AlarmDeactivatedWindow.cpp +1 -1
@@ 65,7 65,7 @@ namespace gui
                                             app::manager::actions::AbortPopup,
                                             std::make_unique<gui::PopupRequestParams>(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,