~aleteoryx/muditaos

43c27e744160bbed7ebbd34c1b41a9eccb1303ba — Tomasz Rybarski 4 years ago e7a4c68
[BH-1252] Alarm Activated Behaviour Change

Alarm Activated should not return to Alarm Set
1 files changed, 2 insertions(+), 1 deletions(-)

M products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp
M products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp => products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp +2 -1
@@ 66,7 66,8 @@ namespace gui
            app::manager::actions::AbortPopup,
            std::make_unique<gui::PopupRequestParams>(gui::popup::ID::AlarmDeactivated));

        if (application->getPrevWindow() == popup::window::alarm_deactivated_window) {
        if ((application->getPrevWindow() == popup::window::alarm_deactivated_window) ||
            (application->getPrevWindow() == gui::window::name::bellAlarmSet)) {
            app::manager::Controller::sendAction(
                application,
                app::manager::actions::Launch,