4 files changed, 16 insertions(+), 6 deletions(-)

M harmony_changelog.md
M products/BellHybrid/apps/Application.cpp
M products/BellHybrid/apps/common/include/common/popups/BellTurnOffOptionWindow.hpp
M products/BellHybrid/apps/common/src/popups/BellTurnOffOptionWindow.cpp

@@ 22,6 22,7 @@
 * Fixed issues with file uploads with low disk space.
 * Fixed hard fault handling
 * Fixed meditation countdown timer when a deep press is performed
+* Fixed "turn off" window display time
 
 ### Added
 

@@ 71,7 71,8 @@ namespace app
                 break;
             case ID::PowerOff:
                 windowsFactory.attach(window::power_off_window, [](ApplicationCommon *app, const std::string &name) {
-                    return std::make_unique<gui::BellTurnOffOptionWindow>(app, window::power_off_window);
+                    return std::make_unique<gui::BellTurnOffOptionWindow>(
+                        app, gui::turnOffPopupTimeout, window::power_off_window);
                 });
                 windowsFactory.attach(gui::BellTurnOffWindow::name,
                                       [](ApplicationCommon *app, const std::string &name) {

@@ 8,11 8,16 @@
 
 namespace gui
 {
+    constexpr std::chrono::seconds turnOffPopupTimeout{10};
+    constexpr std::chrono::milliseconds defaultWindowTimeout{0};
+
     class BellTurnOffOptionWindow : public BellShortOptionWindow
     {
       public:
         static constexpr auto defaultName = "BellTurnOffOptionWindow";
-        explicit BellTurnOffOptionWindow(app::ApplicationCommon *app, const char *name = defaultName);
+        explicit BellTurnOffOptionWindow(app::ApplicationCommon *app,
+                                         std::chrono::milliseconds duration = defaultWindowTimeout,
+                                         const char *name                   = defaultName);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         void onClose(CloseReason reason) override;
 

@@ 16,20 16,23 @@
 
 namespace
 {
-    using namespace std::chrono_literals;
-    constexpr auto windowTimeout{10s};
     constexpr auto timerName{"BellTurnOffPopupTimer"};
 } // namespace
 
 namespace gui
 {
-    BellTurnOffOptionWindow::BellTurnOffOptionWindow(app::ApplicationCommon *app, const char *name)
+    BellTurnOffOptionWindow::BellTurnOffOptionWindow(app::ApplicationCommon *app,
+                                                     std::chrono::milliseconds duration,
+                                                     const char *name)
         : BellShortOptionWindow(app, name), yesStr{utils::translate("common_yes")}, noStr{utils::translate("common_no")}
     {
         addOptions(settingsOptionsList());
         setListTitle(utils::translate("app_bell_turn_off_question"));
 
-        popupTimer    = app::GuiTimerFactory::createSingleShotTimer(application, this, timerName, windowTimeout);
+        if (duration > std::chrono::milliseconds::zero()) {
+            popupTimer = app::GuiTimerFactory::createSingleShotTimer(application, this, timerName, duration);
+        }
+
         timerCallback = [this, name](Item &, sys::Timer &timer) {
             if (application->getCurrentWindow()->getName() == name) {
                 application->returnToPreviousWindow();