From 21f621f985634c2d17f8e96401c16cf278436396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Mon, 17 Jan 2005 16:19:33 +0000
Subject: [PATCH] Make the window shortcut dialog-popup work even when opened
 from the Alt+F3 popup.

svn path=/trunk/kdebase/kwin/; revision=379446
---
 useractions.cpp | 4 +++-
 utils.cpp       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/useractions.cpp b/useractions.cpp
index d9c53d51cf..6dd554573d 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -897,7 +897,9 @@ void Workspace::showWindowMenu( const QRect &pos, Client* cl )
 	else
 	    p->exec( QPoint( x, pos.top() - popupHeight ) );
         }
-    closeActivePopup();
+    // active popup may be already changed (e.g. the window shortcut dialog)
+    if( active_popup == p )
+        closeActivePopup();
     }
 
 /*!
diff --git a/utils.cpp b/utils.cpp
index cd3cdae33e..e58b1efb11 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -23,6 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <kxerrorhandler.h>
 #include <assert.h>
+#include <kdebug.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>