diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java index c5c2ad4fae1cfcf75b42e207eb9ba1198b62654f..d609da124620448edc346f2a846682af34e4117a 100644 --- a/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java +++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java @@ -178,7 +178,7 @@ public class WorkoutActivity extends AppCompatActivity { else { set_countDownTimer.start(); set_break_timer_counting = true; - if (workout_timer_counting) { + if (workout_timer_counting && countdown != null) { countdown.cancel(); workout_timer_counting = false; }