From 2d8cdd7a0823106273463e40db585571e571af40 Mon Sep 17 00:00:00 2001
From: betasteward <betasteward@gmail.com>
Date: Fri, 11 Sep 2015 13:00:42 -0400
Subject: [PATCH] fixed a NPE when disconnecting from chat

---
 Mage.Client/src/main/java/mage/client/chat/ChatPanel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
index eafb65bb2ca..b050dd4e06d 100644
--- a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
+++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
@@ -47,8 +47,8 @@ import mage.client.MageFrame;
 import static mage.client.dialog.PreferencesDialog.KEY_USERS_COLUMNS_ORDER;
 import static mage.client.dialog.PreferencesDialog.KEY_USERS_COLUMNS_WIDTH;
 import mage.client.util.MageTableRowSorter;
-import mage.client.util.gui.TableUtil;
 import mage.client.util.audio.AudioManager;
+import mage.client.util.gui.TableUtil;
 import mage.client.util.gui.countryBox.CountryCellRenderer;
 import mage.remote.MageRemoteException;
 import mage.view.ChatMessage;
@@ -195,7 +195,7 @@ public class ChatPanel extends javax.swing.JPanel {
     }
 
     public void disconnect() {
-        if (MageFrame.getClient() != null) {
+        if (parentChatRef == null && MageFrame.getClient() != null) {
             MageFrame.getClient().leaveChat(chatId);
             MageFrame.removeChat(chatId);
         }