From a035f2c7ee2a0a3f12d127930080c56b8be2b7e0 Mon Sep 17 00:00:00 2001 From: Tom Denham Date: Tue, 26 Feb 2013 13:33:29 +0000 Subject: [PATCH] Revert r10449 as possibly causing problems --- .../communicator/impl/gui/main/MainFrame.java | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java index b287828de..d8214cb15 100644 --- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java @@ -1687,42 +1687,38 @@ public boolean isFrameVisible() */ public void setFrameVisible(final boolean isVisible) { - if (this.isVisible() != isVisible) - { - ConfigurationUtils.setApplicationVisible(isVisible); + ConfigurationUtils.setApplicationVisible(isVisible); - SwingUtilities.invokeLater(new Runnable(){ - public void run() + SwingUtilities.invokeLater(new Runnable(){ + public void run() + { + if(isVisible) { - if(isVisible) - { - MainFrame.this.addNativePlugins(); + MainFrame.this.addNativePlugins(); - Window focusedWindow = keyManager.getFocusedWindow(); + Window focusedWindow = keyManager.getFocusedWindow(); - // If there's another currently focused window we - // prevent this frame from steeling the focus. This - // happens for example in the case of a Master Password - // window which is opened before the contact list - // window. - if (focusedWindow != null) - setFocusableWindowState(false); + // If there's another currently focused window we prevent + // this frame from steeling the focus. This happens for + // example in the case of a Master Password window which is + // opened before the contact list window. + if (focusedWindow != null) + setFocusableWindowState(false); - MainFrame.super.setVisible(isVisible); + MainFrame.super.setVisible(isVisible); - if (focusedWindow != null) - setFocusableWindowState(true); + if (focusedWindow != null) + setFocusableWindowState(true); - MainFrame.super.setExtendedState(MainFrame.NORMAL); - MainFrame.super.toFront(); - } - else - { - MainFrame.super.setVisible(isVisible); - } + MainFrame.super.setExtendedState(MainFrame.NORMAL); + MainFrame.super.toFront(); } - }); - } + else + { + MainFrame.super.setVisible(isVisible); + } + } + }); } /**