2 files changed, 11 insertions(+), 1 deletions(-)

M module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.cpp
M pure_changelog.md

@@ 56,7 56,9 @@ namespace gui
         onLoadCallback = [&]([[maybe_unused]] std::shared_ptr<AlarmEventRecord> alarm) {
             checkCustomOption(getPresenter()->getDescription());
             optionSpinner->setCurrentValue(getPresenter()->getDescription());
-            this->navBarRestoreFromTemporaryMode();
+            if (app::alarmClock::AlarmRRulePresenter::RRuleOptions::Never == getPresenter()->getOption())
+                this->navBarRestoreFromTemporaryMode();
+
         };
     }
 


@@ 73,6 75,13 @@ namespace gui
 
     void AlarmRRuleOptionsItem::checkCustomOption(const std::string &selectedOption)
     {
+        if (rRuleOptions.back().second != "Custom")
+            if (const auto days = getPresenter()->getCustomDays();
+                std::none_of(days.cbegin(), days.cend(), [](const auto &day) { return day.second; })) {
+                rRuleOptions.back().second = "Custom";
+                printOptions();
+            }
+
         for (auto const &option : rRuleOptions) {
             if (selectedOption.empty() || option.second == selectedOption) {
                 return;

@@ 107,6 107,7 @@
 * Fixed the order in which contacts are displayed in the list.
 * Fixed incorrect navigation text in onboarding for timezone and date time.
 * Fixed wrong time displayed on password locked screen with 'Quotes' or 'Logo' wallpaper.
+* Fixed wrong navigation bar state after exit from custom repeat window
 
 
 ## [1.3.0 2022-08-04]