From 7aaf98e5e0c3e7b88fc791b4ee41b97ef017b486 Mon Sep 17 00:00:00 2001
From: Shawn Wallace <yungwallace@live.com>
Date: Mon, 29 Apr 2024 00:44:41 -0400
Subject: [PATCH] Fix incorrect behavior with release build

---
 satellite/src/server/mod.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/satellite/src/server/mod.rs b/satellite/src/server/mod.rs
index 63dc9fa..36165a1 100644
--- a/satellite/src/server/mod.rs
+++ b/satellite/src/server/mod.rs
@@ -345,9 +345,11 @@ impl ObjectMapExt for ObjectMap {
         let objects = keys.each_ref().map(|key| self[*key].0.take().unwrap());
         let key = self.insert(WrappedObject(None));
         let obj = insert_fn(objects.each_ref(), key);
-        debug_assert!(self[key].0.replace(obj).is_none());
+        let ret = self[key].0.replace(obj);
+        debug_assert!(ret.is_none());
         for (object, key) in objects.into_iter().zip(keys.into_iter()) {
-            debug_assert!(self[key].0.replace(object).is_none());
+            let ret = self[key].0.replace(object);
+            debug_assert!(ret.is_none());
         }
     }
 }
@@ -612,7 +614,8 @@ impl<C: XConnection> ServerState<C> {
             let object = &mut self.objects[key];
             let mut object = object.0.take().unwrap();
             object.handle_event(event, self);
-            debug_assert!(self.objects[key].0.replace(object).is_none());
+            let ret = self.objects[key].0.replace(object);
+            debug_assert!(ret.is_none());
         }
 
         {