diff options
author | Riku Isokoski <riksu9000@gmail.com> | 2021-10-05 12:45:03 +0300 |
---|---|---|
committer | Riku Isokoski <riksu9000@gmail.com> | 2021-10-05 12:45:03 +0300 |
commit | f61e88b8425f9edcd38e47027df62dcc56c83adc (patch) | |
tree | 1faacaf82f085ce6ca718d598b13a4f509a8e0ff /src/systemtask/SystemTask.cpp | |
parent | e468acc99e4d7e188dc902983640f5eb8e8ff31f (diff) | |
parent | 392c7ad2aceecd8fe976165b66d39f0ed2083911 (diff) |
Merge branch 'develop' into update_touch_driver
Diffstat (limited to 'src/systemtask/SystemTask.cpp')
-rw-r--r-- | src/systemtask/SystemTask.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index 1bfff911..38e48c8f 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -274,10 +274,12 @@ void SystemTask::Work() { displayApp.PushMessage(Pinetime::Applications::Display::Messages::UpdateDateTime); break; case Messages::OnNewNotification: - if (isSleeping && !isWakingUp) { - GoToRunning(); + if (settingsController.GetNotificationStatus() == Pinetime::Controllers::Settings::Notification::ON) { + if (isSleeping && !isWakingUp) { + GoToRunning(); + } + displayApp.PushMessage(Pinetime::Applications::Display::Messages::NewNotification); } - displayApp.PushMessage(Pinetime::Applications::Display::Messages::NewNotification); break; case Messages::OnTimerDone: if (isSleeping && !isWakingUp) { |