do not rejoin console or private chats, fix NPE when disconnecting with private window open

2019-11-26 05:28:24 +00:00
parent f4cd1c30cd
commit c0f6b1ed73
1 changed files with 2 additions and 2 deletions
--- 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()
        }
    }
 }