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

M module-apps/application-phonebook/windows/PhonebookMultipleNumbersSelect.cpp
M module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.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<PhonebookMultipleNumbersRequest *>(data);
-        assert(numberSelectData);
 
         setTitle(numberSelectData->record->getFormattedName());
         numberModel->createData(numberSelectData->record);

@@ 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;
         }