diff options
Diffstat (limited to 'src/displayapp')
| -rw-r--r-- | src/displayapp/screens/Timer.cpp | 3 | ||||
| -rw-r--r-- | src/displayapp/screens/Timer.h | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp index 91e6f49..935dbe2 100644 --- a/src/displayapp/screens/Timer.cpp +++ b/src/displayapp/screens/Timer.cpp @@ -60,7 +60,6 @@ void Timer::Stop() { secondsToSet = secondsRemaining % 60; } timerController.StopTimer(); - timerController.StopAlerting(); RefreshRunning(); } @@ -94,7 +93,6 @@ Timer::~Timer() { lv_obj_clean(lv_scr_act()); if (timerController.IsRunning() && timerController.IsOvertime()) { timerController.StopTimer(); - timerController.StopAlerting(); } } @@ -129,4 +127,3 @@ void Timer::RefreshRunning() { CreateButtons(); } } - diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h index 9b1431e..cb5aeb2 100644 --- a/src/displayapp/screens/Timer.h +++ b/src/displayapp/screens/Timer.h @@ -32,12 +32,7 @@ namespace Pinetime::Applications::Screens { if (event == LV_EVENT_CLICKED) { if (obj == btnPlayPause) { if (timerController.IsRunning()) { - uint32_t seconds = timerController.GetSecondsRemaining(); - minutesToSet = seconds / 60; - secondsToSet = seconds % 60; - timerController.StopTimer(); - CreateButtons(); - RefreshRunning(); + Stop(); } else if (secondsToSet + minutesToSet > 0) { timerController.StartTimer((secondsToSet + minutesToSet * 60) * 1000); RefreshRunning(); |
