From d9399eafc97212834048f84e7dd2a1319ec8a293 Mon Sep 17 00:00:00 2001 From: Jens Krause <47693+sectore@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:21:17 +0100 Subject: [PATCH] fix(countdown): Reset `MET` if `countdown` is set by cli arguments (#71) * fix: Reset MET if countdown is set by args * update CHANGELOG --- CHANGELOG.md | 4 ++++ src/app.rs | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca87923..f25d460 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +### Fixes + +(countdown) Reset `Mission Elapsed Time (MET)` if `countdown` is set by cli arguments [#71](https://github.com/sectore/timr-tui/pull/71) + ### Misc. (cargo) Exclude files for packaging [e7a5a1b](https://github.com/sectore/timr-tui/commit/e7a5a1b2da7a7967f2602a0b92f391ac768ca638) diff --git a/src/app.rs b/src/app.rs index 1f02d59..b1f9141 100644 --- a/src/app.rs +++ b/src/app.rs @@ -103,7 +103,11 @@ impl From for App { initial_value_countdown: args.countdown.unwrap_or(stg.inital_value_countdown), // invalidate `current_value_countdown` if an initial value is set via args current_value_countdown: args.countdown.unwrap_or(stg.current_value_countdown), - elapsed_value_countdown: stg.elapsed_value_countdown, + elapsed_value_countdown: match args.countdown { + // reset value if countdown is set by arguments + Some(_) => Duration::ZERO, + None => stg.elapsed_value_countdown, + }, current_value_timer: stg.current_value_timer, app_tx, #[cfg(feature = "sound")]