Merge branch 'develop' into disable_notif_only

2021-09-13 21:22:53 +03:00
parent 3ee4876214 b0bdd2be1c
commit 40765f1173
28 changed files with 177 additions and 162 deletions
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -114,7 +114,7 @@ namespace Pinetime {
      };

      void setWakeUpMode(WakeUpMode wakeUp, bool enabled) {
-        if (!isWakeUpModeOn(wakeUp)) {
+        if (enabled != isWakeUpModeOn(wakeUp)) {
          settingsChanged = true;
        }
        settings.wakeUpMode.set(static_cast<size_t>(wakeUp), enabled);