Fixes showing dialog from EDT.

src/net/java/sip/communicator/plugin/desktoputil/MasterPasswordInputDialog.java

@@ -197,21 +197,28 @@ public static String showInput(final boolean prevSuccess)
     {
         try
         {
-            SwingUtilities.invokeAndWait(new Runnable()
+            if(!SwingUtilities.isEventDispatchThread())
             {
-                @Override
-                public void run()
+                SwingUtilities.invokeAndWait(new Runnable()
                 {
-                    if (dialog == null)
-                        dialog = new MasterPasswordInputDialog();
+                    @Override
+                    public void run()
+                    {
+                        showInput(prevSuccess);
+                    }
+                });
+            }
+            else
+            {
+                if(dialog == null)
+                    dialog = new MasterPasswordInputDialog();
 
-                    dialog.rebuildMainPanel(!prevSuccess);
-                    dialog.resetPassword();
+                dialog.rebuildMainPanel(!prevSuccess);
+                dialog.resetPassword();
 
-                    // blocks until user performs an action
-                    dialog.setVisible(true);
-                }
-            });
+                // blocks until user performs an action
+                dialog.setVisible(true);
+            }
         }
         catch(Throwable t)
         {