From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 8 Dec 2020 17:42:24 +0000 (+0000)
Subject: only remove tokens for this game!
X-Git-Tag: otter-0.2.0~207
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=19d9912f7b0f55c719dae90ea7ce974a2271fd49;p=otter.git

only remove tokens for this game!

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

diff --git a/src/global.rs b/src/global.rs
index 1f4ff584..184c25e1 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -808,10 +808,11 @@ impl<'ig> InstanceGuard<'ig> {
   fn tokens_deregister_for_id<Id:AccessId, F: Fn(Id) -> bool
                               > (&mut self, oldid: F) {
     let mut tokens = AccessId::global_tokens(PRIVATE_Y).write().unwrap();
-    tokens.retain(|k,v| {
-      let remove = oldid(v.ident);
-      if remove { Id::tokens_registry(self, PRIVATE_Y).tr.remove(k); }
-      !remove
+    tokens.retain(|k,v| if_chain! {
+      if oldid(v.ident);
+      if Id::tokens_registry(self, PRIVATE_Y).tr.remove(k);
+      then { false }
+      else { true }
     });
   }