aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java
diff options
context:
space:
mode:
authorYana Stamcheva <yana@jitsi.org>2012-02-17 13:57:36 +0000
committerYana Stamcheva <yana@jitsi.org>2012-02-17 13:57:36 +0000
commit63c9ed630acba1bf5b7712f786b6b16445f87c18 (patch)
tree230d5079e35579bdf6f2e48f2e8f86acda5f8ea4 /src/net/java
parent56584e435fe042b1c4b194b311041e98989f0144 (diff)
downloadjitsi-63c9ed630acba1bf5b7712f786b6b16445f87c18.zip
jitsi-63c9ed630acba1bf5b7712f786b6b16445f87c18.tar.gz
jitsi-63c9ed630acba1bf5b7712f786b6b16445f87c18.tar.bz2
Fixes disappearing contact list window.
Diffstat (limited to 'src/net/java')
-rw-r--r--src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java b/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
index 7755722..94ed5bb 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
@@ -94,11 +94,17 @@ public class ExtendedTooltip
Window popupWindow
= SwingUtilities.getWindowAncestor(ExtendedTooltip.this);
- if (popupWindow != null && popupWindow.isVisible())
+ if (popupWindow != null
+ && popupWindow.isVisible()
+ // The popup window should normally be a JWindow, so we
+ // check here explicitly if for some reason we didn't get
+ // something else.
+ && (popupWindow instanceof JWindow))
{
if (logger.isInfoEnabled())
logger.info("Tooltip window ancestor to hide: "
+ popupWindow);
+
popupWindow.setVisible(false);
}
}
@@ -117,7 +123,12 @@ public class ExtendedTooltip
= SwingUtilities.getWindowAncestor(ExtendedTooltip.this);
if (popupWindow != null
- && popupWindow.isVisible())
+ && popupWindow.isVisible()
+ && !(popupWindow instanceof JFrame)
+ // The popup window should normally be a JWindow, so we
+ // check here explicitly if for some reason we didn't get
+ // something else.
+ && (popupWindow instanceof JWindow))
{
if (logger.isInfoEnabled())
logger.info("Tooltip window ancestor to hide: "