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

M products/BellHybrid/alarms/src/actions/FrontlightAction.cpp
M products/BellHybrid/alarms/src/actions/FrontlightAction.hpp

@@ 99,6 99,7 @@ namespace alarms
     bool FrontlightAction::execute()
     {
         std::string settingString;
+        std::string prewakeupString;
 
         switch (settingsDependency) {
         case SettingsDependency::AlarmClock:


@@ 111,9 112,10 @@ namespace alarms
             }
             break;
         case SettingsDependency::Prewakeup:
+            prewakeupString = settings.getValue(bell::settings::PrewakeUp::duration, settings::SettingsScope::Global);
             settingString =
                 settings.getValue(bell::settings::PrewakeUp::lightDuration, settings::SettingsScope::Global);
-            if (settingString == std::string(prewakeupFrontlightOFF)) {
+            if (settingString == std::string(prewakeupFrontlightOFF) || prewakeupString == std::string(prewakeupOFF)) {
                 return true;
             }
             break;

@@ 36,6 36,7 @@ namespace alarms
       private:
         static constexpr std::string_view alarmFrontlightOFF     = "0";
         static constexpr std::string_view prewakeupFrontlightOFF = "0";
+        static constexpr std::string_view prewakeupOFF           = "0";
 
         sys::Service &service;
         SettingsDependency settingsDependency;