From 40542f75c0c9782d5fcbeef8df1f5644292686ba Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Wed, 24 Jul 2013 18:30:51 +0300 Subject: [PATCH] Fixes NPE when focusing multichat windows. --- .../communicator/impl/gui/main/chat/toolBars/MainToolBar.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java index 724026918..44b653bb4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java @@ -344,7 +344,9 @@ public void chatChanged(ChatPanel chatPanel) sendFileButton.setEnabled( chatPanel.findFileTransferChatTransport() != null); - new UpdateCallButtonWorker(contact).start(); + // null when using chat rooms + if(contact != null) + new UpdateCallButtonWorker(contact).start(); changeHistoryButtonsState(chatPanel); }