From bc16ffd341ff1edf981948a20eda359fe711ca29 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Tue, 11 May 2010 11:32:17 +0000 Subject: [PATCH] Addressing issue #818 (NPE when sending File if no chat window is open). NullPointerException is now fixed. --- .../main/contactlist/MetaContactRightButtonMenu.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java index b05598092..6fbf26d9d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java @@ -18,6 +18,7 @@ import net.java.sip.communicator.impl.gui.event.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.call.*; +import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.main.chat.history.*; import net.java.sip.communicator.impl.gui.main.contactlist.contactsource.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -475,9 +476,15 @@ else if (itemName.equalsIgnoreCase("sendFile")) ConfigurationManager.setSendFileLastDir( selectedFile.getParent()); + // Obtain the corresponding chat panel. + ChatPanel chatPanel + = GuiActivator.getUIService(). + getChatWindowManager().getContactChat(contactItem, true); + + chatPanel.sendFile(selectedFile); + GuiActivator.getUIService(). - getChatWindowManager().getSelectedChat(). - sendFile(selectedFile); + getChatWindowManager().openChat(chatPanel, true); } GuiActivator.getUIService().getChatWindowManager()