From 8432f238cc6488a019384bf27febdb2d651ab94b Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Wed, 23 Oct 2013 12:54:37 +0300
Subject: [PATCH] Removes listeners when chat window is disposed.

---
 .../gui/main/chat/conference/ConferenceChatSession.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
index f044727c2..d4aa938d1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
@@ -90,11 +90,12 @@ public Object getDescriptor()
     @Override
     public void dispose()
     {
+        ChatRoom chatRoom = chatRoomWrapper.getChatRoom();
+        chatRoom.removeMemberPresenceListener(this);
+        chatRoom.removePropertyChangeListener(this);
+
         if(ConfigurationUtils.isLeaveChatRoomOnWindowCloseEnabled())
         {
-            ChatRoom chatRoom = chatRoomWrapper.getChatRoom();
-            chatRoom.removeMemberPresenceListener(this);
-            chatRoom.removePropertyChangeListener(this);
             chatRoom.leave();
         }
     }