From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 26 Mar 2021 18:51:05 +0000 (+0000)
Subject: cmdlistener: DeletePiece: Do not delete the ipc right away eitheer
X-Git-Tag: otter-0.5.0~394
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=163b4ab388a3fb90676947c2fe9e1287ece31c4a;p=otter.git

cmdlistener: DeletePiece: Do not delete the ipc right away eitheer

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 25c17857..3ae2df2f 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -592,8 +592,8 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
     MGI::DeletePiece(piece) => {
       let (ig_g, modperm, _) = cs.check_acl_modify_pieces(ag, ig)?;
       let ig = &mut **ig_g;
-      let ipc = ig.ipieces.as_mut(modperm)
-        .remove(piece).ok_or(ME::PieceNotFound)?;
+      let _ipc = ig.ipieces.as_mut(modperm)
+        .get(piece).ok_or(ME::PieceNotFound)?;
       let gs = &mut ig.gs;
       let gpc = gs.pieces.as_mut(modperm).get_mut(piece);
       let mut xupdates = vec![];
@@ -617,6 +617,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
       }
       let ioccults = &ig.ioccults;
       let gpc = gs.pieces.as_mut(modperm).remove(piece);
+      let ipc = ig.ipieces.as_mut(modperm).remove(piece).unwrap();
       let desc_html = if let Some(gpc) = &gpc {
         let pri = PieceRenderInstructions::new_visible(default());
         pri.describe(ioccults,&gs.occults, gpc, &ipc)