From 662c57037177a0b3e1d9f94f91d4afcf5d856d2b Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Fri, 2 Apr 2021 16:16:44 +0200
Subject: [PATCH] Close room if it is opened while leaving it

---
 imports/NeoChat/Menu/RoomListContextMenu.qml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/imports/NeoChat/Menu/RoomListContextMenu.qml b/imports/NeoChat/Menu/RoomListContextMenu.qml
index de86cd278..60e0ab765 100644
--- a/imports/NeoChat/Menu/RoomListContextMenu.qml
+++ b/imports/NeoChat/Menu/RoomListContextMenu.qml
@@ -44,7 +44,12 @@ Menu {
 
     MenuItem {
         text: i18n("Leave Room")
-        onTriggered: room.forget()
+        onTriggered: {
+            if(roomManager.currentRoom == root.room) {
+                pageStack.pop()
+            }
+            room.forget()
+        }
     }
 
     onClosed: destroy()