Attempts to fix NPE when publishing a conference in chat room.

12 years ago · a7e685476c
parent 7cbe754b4d
commit a7e685476c
2 changed files with 3 additions and 2 deletions
--- 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 void showChatConferenceDialog()
        }
        
        chatConferencesDialog.setVisible(true);
-        chatConferencesDialog.pack();
+        
        chatConferencesDialog.toFront();
+        chatConferencesDialog.pack();
    }
    
    /**
--- 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 @@ else if(source.equals(endConference))
            {
                chatRoom.publishConference(null, null);
            }
-            this.dispose();
+            this.setVisible(false);

        }
        else if(source instanceof JRadioButton)