3 files changed, 4 insertions(+), 3 deletions(-)

M module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.cpp
M module-apps/application-settings/windows/system/SystemMainWindow.cpp
M pure_changelog.md

@@ 12,7 12,7 @@
 namespace gui
 {
     ChangeDateAndTimeWindow::ChangeDateAndTimeWindow(app::ApplicationCommon *app, std::string name)
-        : AppWindow(app, name), dateAndTimeModel{std::make_shared<DateAndTimeModel>(this->application)}
+        : AppWindow(app, std::move(name)), dateAndTimeModel{std::make_shared<DateAndTimeModel>(this->application)}
     {
         buildInterface();
     }


@@ 50,6 50,7 @@ namespace gui
         if (inputEvent.isShortRelease(gui::KeyCode::KEY_ENTER)) {
             dateAndTimeModel->saveData(fromTillDate);
             sendRtcUpdateTimeMessage();
+            application->returnToPreviousWindow();
             return true;
         }
 

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SystemMainWindow.hpp"


@@ 8,7 8,6 @@
 #include <DialogMetadataMessage.hpp>
 #include <OptionSetting.hpp>
 #include <service-desktop/DesktopMessages.hpp>
-#include <service-desktop/ServiceDesktop.hpp>
 
 namespace gui
 {

@@ 42,6 42,7 @@
 * Fixed multiple issues with input fields in "New alarm" window
 * Fixed the ability to create a contact with the same primary and secondary phone number, which resulted in mismatching
 * Fixed losing drafted message and recipient number in new message windows
+* Fixed misleading "Save" button behavior in "Date and time" window
 
 ## [1.7.2 2023-07-28]