diff options
| -rw-r--r-- | make.mk | 2 | ||||
| -rw-r--r-- | movement/watch_faces/complication/countdown_face.c | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -31,7 +31,7 @@ else endif ifeq ($(DETECTED_OS), LINUX) - MAKEFLAGS += -j `nproc` + MAKEFLAGS += -j $(shell nproc) endif ifeq ($(DETECTED_OS), OSX) NPROCS = $(shell sysctl hw.ncpu | grep -o '[0-9]\+') diff --git a/movement/watch_faces/complication/countdown_face.c b/movement/watch_faces/complication/countdown_face.c index 81836f37..ee523b41 100644 --- a/movement/watch_faces/complication/countdown_face.c +++ b/movement/watch_faces/complication/countdown_face.c @@ -179,7 +179,10 @@ bool countdown_face_loop(movement_event_t event, movement_settings_t *settings, reset(state); break; case cd_waiting: - start(state, settings); + if (!(state->minutes == 0 && state->seconds == 0)) { + // Only start the timer if we have a valid time. + start(state, settings); + } break; case cd_setting: settings_increment(state); @@ -192,7 +195,7 @@ bool countdown_face_loop(movement_event_t event, movement_settings_t *settings, break; case EVENT_ALARM_LONG_PRESS: if (state->mode == cd_setting) { - state->minutes = DEFAULT_MINUTES; + state->minutes = 0; state->seconds = 0; draw(state, event.subsecond); break; |