From a5dc6db4e8c443d4a120a11a3cc19f0039163aeb Mon Sep 17 00:00:00 2001
From: Krille <c.kussowski@famedly.com>
Date: Fri, 10 Jan 2025 14:57:54 +0100
Subject: [PATCH] fix: Do not leave old room if join new room failed

---
 lib/pages/chat/chat.dart | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index dc8f853a2..fd32c26fa 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -1061,16 +1061,16 @@ class ChatController extends State<ChatPageWithRoom>
     }
     final result = await showFutureLoadingDialog(
       context: context,
-      future: () => room.client.joinRoom(
-        room
-            .getState(EventTypes.RoomTombstone)!
-            .parsedTombstoneContent
-            .replacementRoom,
-      ),
-    );
-    await showFutureLoadingDialog(
-      context: context,
-      future: room.leave,
+      future: () async {
+        final roomId = room.client.joinRoom(
+          room
+              .getState(EventTypes.RoomTombstone)!
+              .parsedTombstoneContent
+              .replacementRoom,
+        );
+        await room.leave();
+        return roomId;
+      },
     );
     if (result.error == null) {
       context.go('/rooms/${result.result!}');