From b3936f6d0200c4e0792a109a03ad41bb2a99334c Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Thu, 26 Jul 2012 13:26:28 +0000
Subject: [PATCH] Fixes call conference creation from Tools menu.

---
 .../impl/gui/main/call/CallPanel.java         | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
index 751bba184..966a7a2fb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
@@ -9,6 +9,7 @@
 import java.awt.*;
 import java.awt.Container;
 import java.awt.event.*;
+import java.lang.reflect.*;
 import java.util.*;
 
 import javax.swing.*;
@@ -1339,13 +1340,24 @@ public void enableConferenceInterface(final boolean isVideo)
     {
         if (!SwingUtilities.isEventDispatchThread())
         {
-            SwingUtilities.invokeLater(new Runnable()
+            try
             {
-                public void run()
+                SwingUtilities.invokeAndWait(new Runnable()
                 {
-                    enableConferenceInterface(isVideo);
-                }
-            });
+                    public void run()
+                    {
+                        enableConferenceInterface(isVideo);
+                    }
+                });
+            }
+            catch (InterruptedException e)
+            {
+                logger.error("Failed to enable conference interface", e);
+            }
+            catch (InvocationTargetException e)
+            {
+                logger.error("Failed to enable conference interface", e);
+            }
             return;
         }