~aleteoryx/muditaos

0a0366bb7474f15400948d9209cdc19274ab0e5d — Piotr Tanski 5 years ago 47740ca
[EGD-4267] Don't clean application windows if the application switch is not yet confirmed. (#1040)

2 files changed, 2 insertions(+), 9 deletions(-)

M changelog.md
M module-apps/Application.cpp
M changelog.md => changelog.md +1 -0
@@ 24,6 24,7 @@
### Fixed

* `[desktop]` Absent call button on desktop with notifications fix
* `[desktop]` Fixed system freeze on pressing Back button while focused on desktop.
* `[messages]` Fixed clearing text on options/recipient choice in new message window.
* `[Text]` Fixed newline handling.
* `[appmgr]` Fixed applications closing.

M module-apps/Application.cpp => module-apps/Application.cpp +1 -9
@@ 178,10 178,7 @@ namespace app

    void Application::returnToPreviousWindow(const uint32_t times)
    {
        auto prevWindow = getPrevWindow(times);
        if (prevWindow == gui::name::window::no_window) {
            LOG_INFO("Back to previous application");
            cleanPrevWindw();
        if (const auto prevWindow = getPrevWindow(times); prevWindow == gui::name::window::no_window) {
            app::manager::Controller::switchBack(this);
        }
        else {


@@ 676,11 673,6 @@ namespace app
        return *std::prev(windowsStack.stack.end(), count + 1);
    }

    void Application::Application::cleanPrevWindw()
    {
        this->windowsStack.stack.clear();
    }

    gui::AppWindow *Application::getCurrentWindow()
    {
        if (windowsStack.stack.size() == 0) {