From c83f293a6a3ed25388487f5028fe75d976a0fa00 Mon Sep 17 00:00:00 2001 From: Przemyslaw Brudny Date: Wed, 2 Feb 2022 12:18:06 +0100 Subject: [PATCH] [EGD-8218] PhoneLock timer fix on return from emergency PhoneLock timer fix on return from emergency. --- .../windows/PhonebookMultipleNumbersSelect.cpp | 6 +++++- .../apps-common/popups/lock-popups/PhoneLockedWindow.cpp | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/module-apps/application-phonebook/windows/PhonebookMultipleNumbersSelect.cpp b/module-apps/application-phonebook/windows/PhonebookMultipleNumbersSelect.cpp index d5d64d2f2a2bbaa14073bdc6cfbf090988b8149c..a1aa8947144a5ce95cfd3fa2413b900f02fc2026 100644 --- a/module-apps/application-phonebook/windows/PhonebookMultipleNumbersSelect.cpp +++ b/module-apps/application-phonebook/windows/PhonebookMultipleNumbersSelect.cpp @@ -36,8 +36,12 @@ namespace gui void PhonebookMultipleNumbersSelect::onBeforeShow(ShowMode mode, SwitchData *data) { + if (data == nullptr) { + application->switchWindow(name::window::main_window); + return; + } + auto numberSelectData = dynamic_cast(data); - assert(numberSelectData); setTitle(numberSelectData->record->getFormattedName()); numberModel->createData(numberSelectData->record); diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp b/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp index 5882615fea50044661221964034b116e9d93a107..f620aaf1bc4fab1bd81cd6bbba89b1166d955f86 100644 --- a/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp +++ b/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp @@ -41,11 +41,11 @@ namespace gui if (notificationData) { notificationsModel->updateData(notificationData); } - else if (!notificationsModel->isPhoneTimeLock()) { - app::manager::Controller::requestNotifications(application); + else { navBar->setActive(nav_bar::Side::Left, false); navBar->setActive(nav_bar::Side::Center, false); navBar->setActive(nav_bar::Side::Right, false); + app::manager::Controller::requestNotifications(application); return; }