5 files changed, 14 insertions(+), 3 deletions(-)

M module-apps/Application.cpp
M module-apps/Application.hpp
M module-apps/application-call/ApplicationCall.hpp
M module-apps/application-call/windows/CallWindow.cpp
M module-apps/application-phonebook/models/PhonebookModel.cpp

@@ 268,6 268,13 @@ namespace app
         }
     }
 
+    void Application::popCurrentWindow()
+    {
+        if (!windowsStack.stack.empty()) {
+            windowsStack.stack.pop_back();
+        }
+    }
+
     void Application::refreshWindow(gui::RefreshModes mode)
     {
         if (not windowsStack.isEmpty()) {

@@ 236,6 236,9 @@ namespace app
         ///@param ignoredWindowsNumber: defines how many windows will be skipped while going back on stack
         void returnToPreviousWindow(const uint32_t times = 1);
 
+        /// Pops the current window from the windows stack
+        void popCurrentWindow();
+
         /// Method refreshing active window
         void refreshWindow(gui::RefreshModes mode);
 

@@ 21,8 21,8 @@ namespace app
 
     namespace window
     {
-        inline constexpr auto name_call              = gui::name::window::main_window;
-        inline constexpr auto name_enterNumber       = "EnterNumberWindow";
+        inline constexpr auto name_enterNumber       = gui::name::window::main_window;
+        inline constexpr auto name_call              = "CallWindow";
         inline constexpr auto name_emergencyCall     = "EmergencyCallWindow";
         inline constexpr auto name_duplicatedContact = "DuplicatedContactWindow";
         inline constexpr auto name_dialogConfirm     = "DialogConfirm";

@@ 412,6 412,7 @@ namespace gui
             LOG_DEBUG("Delayed exit timer callback");
             setState(State::IDLE);
             app::manager::Controller::switchBack(application);
+            application->popCurrentWindow();
             return true;
         };
         delayedExitTimer =

@@ 148,7 148,7 @@ auto PhonebookModel::getItem(gui::Order order) -> gui::ListItem *
             if (item->contact && !item->contact->numbers.empty()) {
                 const auto phoneNumber = item->contact->numbers.front().number;
                 return app::manager::Controller::sendAction(application,
-                                                            app::manager::actions::Dial,
+                                                            app::manager::actions::Call,
                                                             std::make_unique<app::ExecuteCallData>(phoneNumber),
                                                             app::manager::OnSwitchBehaviour::RunInBackground);
             }