From be51d650582b4af503f1d375ebd213386712859e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Thu, 26 Jun 2003 13:09:45 +0000
Subject: [PATCH] Fix #60277.

svn path=/trunk/kdebase/kwin/; revision=233897
---
 workspace.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index e7a3f62dca..d34f18483e 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1482,12 +1482,10 @@ void Workspace::setActiveClient( Client* c )
     if ( !menubar && !has_full_screen)
     {
         // Find the menubar of the desktop
-        if ( !desktops.isEmpty() ) {
-            for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
-                if ( (*it)->isTopMenu() && (*it)->mainClient()->isDesktop() ) {
-                    menubar = *it;
-                    break;
-                }
+        for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
+            if( (*it)->isTopMenu() && ((*it)->mainClient()->isDesktop() || (*it)->transientFor() == rootWin())) {
+                menubar = *it;
+                break;
             }
         }
 #if 0 // I don't like this - why to show a menubar belonging to another application?