diff options
| author | hristoterezov <hristo@jitsi.org> | 2013-10-29 12:39:17 +0200 |
|---|---|---|
| committer | hristoterezov <hristo@jitsi.org> | 2013-10-29 12:39:17 +0200 |
| commit | a7e685476c1bd29b9feb50afbc3a791d257041a6 (patch) | |
| tree | b61ca351b7ae3cdd26b0fa9b5fc9d18292e4a048 /src/net/java/sip | |
| parent | 7cbe754b4d654d0091d879b584fa3c0713c1b876 (diff) | |
| download | jitsi-a7e685476c1bd29b9feb50afbc3a791d257041a6.zip jitsi-a7e685476c1bd29b9feb50afbc3a791d257041a6.tar.gz jitsi-a7e685476c1bd29b9feb50afbc3a791d257041a6.tar.bz2 | |
Attempts to fix NPE when publishing a conference in chat room.
Diffstat (limited to 'src/net/java/sip')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java | 3 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java index 078a9d6..3adbaf7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java @@ -414,8 +414,9 @@ public class ChatPanel } chatConferencesDialog.setVisible(true); - chatConferencesDialog.pack(); + chatConferencesDialog.toFront(); + chatConferencesDialog.pack(); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java index d55d5ae..ec4f8ba 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java @@ -294,7 +294,7 @@ public class ChatConferenceCallDialog { chatRoom.publishConference(null, null); } - this.dispose(); + this.setVisible(false); } else if(source instanceof JRadioButton) |