From 229d4e2e1dfbf6afa858b6840d34e82f6cd2a9e0 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Fri, 15 Jul 2022 21:46:41 +0100
Subject: [PATCH] fix: correct ordering for creating ownership change event

---
 crates/delta/src/routes/channels/channel_edit.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/delta/src/routes/channels/channel_edit.rs b/crates/delta/src/routes/channels/channel_edit.rs
index 8d54ae1f..b1ff5ea4 100644
--- a/crates/delta/src/routes/channels/channel_edit.rs
+++ b/crates/delta/src/routes/channels/channel_edit.rs
@@ -83,11 +83,11 @@ pub async fn req(
             }
 
             // Transfer ownership
-            *owner = new_owner.to_string();
+            let old_owner = std::mem::replace(owner, new_owner.to_string());
 
             // Notify clients
             SystemMessage::ChannelOwnershipChanged {
-                from: owner.to_string(),
+                from: old_owner,
                 to: new_owner,
             }
         } else {