2 files changed, 37 insertions, 33 deletions
diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index 2e3456a..3648142 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -2,36 +2,37 @@
 
 namespace Pinetime {
   namespace System {
-      enum class Messages {
-        GoToSleep,
-        GoToRunning,
-        TouchWakeUp,
-        OnNewTime,
-        OnNewNotification,
-        OnTimerDone,
-        OnNewCall,
-        BleConnected,
-        UpdateTimeOut,
-        BleFirmwareUpdateStarted,
-        BleFirmwareUpdateFinished,
-        OnTouchEvent,
-        HandleButtonEvent,
-        HandleButtonTimerEvent,
-        OnDisplayTaskSleeping,
-        EnableSleeping,
-        DisableSleeping,
-        OnNewDay,
-        OnNewHour,
-        OnNewHalfHour,
-        OnChargingEvent,
-        OnPairing,
-        SetOffAlarm,
-        StopRinging,
-        MeasureBatteryTimerExpired,
-        BatteryPercentageUpdated,
-        StartFileTransfer,
-        StopFileTransfer,
-        BleRadioEnableToggle
-      };
-    }
+    enum class Messages {
+      GoToSleep,
+      GoToRunning,
+      TouchWakeUp,
+      OnNewTime,
+      OnAdjustTime,
+      OnNewNotification,
+      OnTimerDone,
+      OnNewCall,
+      BleConnected,
+      UpdateTimeOut,
+      BleFirmwareUpdateStarted,
+      BleFirmwareUpdateFinished,
+      OnTouchEvent,
+      HandleButtonEvent,
+      HandleButtonTimerEvent,
+      OnDisplayTaskSleeping,
+      EnableSleeping,
+      DisableSleeping,
+      OnNewDay,
+      OnNewHour,
+      OnNewHalfHour,
+      OnChargingEvent,
+      OnPairing,
+      SetOffAlarm,
+      StopRinging,
+      MeasureBatteryTimerExpired,
+      BatteryPercentageUpdated,
+      StartFileTransfer,
+      StopFileTransfer,
+      BleRadioEnableToggle
+    };
+  }
 }
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 7e34b23..760f216 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -284,9 +284,12 @@ void SystemTask::Work() {
           heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::GoToSleep);
           break;
         case Messages::OnNewTime:
+        case Messages::OnAdjustTime:
           ReloadIdleTimer();
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::UpdateDateTime);
-          if (alarmController.State() == Controllers::AlarmController::AlarmState::Set) {
+          if (message == Messages::OnAdjustTime) {
+            alarmController.OnAdjustTime();
+          } else {
             alarmController.ScheduleAlarm();
           }
           break;