summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-09-23 13:11:34 +0000
committerFlorian Jung <flo@windfisch.org>2011-09-23 13:11:34 +0000
commitd52fac00567bb85944188f3c946b86b2a420819c (patch)
tree6db56ee33fda6adce28afc456c4fd84b56180453 /muse2
parent7ade50ecbd7dd851684f4e3e5bb5cb92fa1d9a15 (diff)
improved the "menu bar focus"-fix even more
Diffstat (limited to 'muse2')
-rw-r--r--muse2/muse/app.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 1fcfef56..9f858bc3 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -3102,7 +3102,8 @@ void MusE::activeTopWinChangedSlot(TopWin* win)
{
if (MusEGlobal::debugMsg) printf("ACTIVE TOPWIN CHANGED to '%s' (%p)\n", win ? win->windowTitle().toAscii().data() : "<None>", win);
- if (win && (win->isMdiWin()==false) && win->sharesToolsAndMenu())
+ if ( (win && (win->isMdiWin()==false) && win->sharesToolsAndMenu()) &&
+ ( (mdiArea->currentSubWindow() != NULL) && (mdiArea->currentSubWindow()->isVisible()==true) ) )
{
if (MusEGlobal::debugMsg) printf(" that's a menu sharing muse window which isn't inside the MDI area.\n");
// if a window gets active which a) is a muse window, b) is not a mdi subwin and c) shares menu- and toolbar,