From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 20 Mar 2021 21:38:47 +0000 (+0000)
Subject: clock: Fix reset view again
X-Git-Tag: otter-0.5.0~609
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ac90881ead6a1a51c9abb78ad613f45aeb92cac5;p=otter.git

clock: Fix reset view again

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/clock.rs b/src/clock.rs
index 44888a5f..b14359ff 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -201,8 +201,9 @@ impl Clock {
   {
     let mut r: [URender;N] = izip!(
       USERS.iter(),
-      state.users.iter()
-    ).map(|(&user, ustate)| {
+      state.users.iter(),
+      self.spec.initial().iter().copied(),
+    ).map(|(&user, ustate, initial)| {
       let nick = gplayers.get(ustate.player)
         .map(|gpl| gpl.nick.as_str());
       let (st, remaining) =
@@ -218,7 +219,7 @@ impl Clock {
               } else {
                 URS::Running
               }
-            } else if ustate.remaining == self.spec.initial_time() {
+            } else if ustate.remaining == initial {
               URS::Reset
             } else {
               URS::Stopped