From c0f6b1ed73a561cc9fdf4c70a692396613a3ec2f Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Tue, 26 Nov 2019 05:28:24 +0000
Subject: [PATCH] do not rejoin console or private chats, fix NPE when
 disconnecting with private window open

---
 .../controllers/com/muwire/gui/ChatRoomController.groovy      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
index b40107ea..2e7de476 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
@@ -251,7 +251,7 @@ class ChatRoomController {
     }
     
     void rejoinRoom() {
-        if (model.room == "Console")
+        if (model.console || model.privateChat)
             return
         
         model.members.clear()
@@ -276,7 +276,7 @@ class ChatRoomController {
     void serverDisconnected() {
         runInsideUIAsync {
             model.members.clear()
-            view.membersTable?.model.fireTableDataChanged()
+            view.membersTable?.model?.fireTableDataChanged()
         }
     }
 }
\ No newline at end of file