summaryrefslogtreecommitdiff
path: root/muse2/muse/app.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-08-21 14:29:25 +0000
committerFlorian Jung <flo@windfisch.org>2011-08-21 14:29:25 +0000
commit958f22a0b718d5a94cecd20073710c80e609cdac (patch)
tree714f9cf4fc6aca09e2c1c9d275e70ce347f692ff /muse2/muse/app.cpp
parentedbe737895dacf8bf54813d7bc99c5e851dc8018 (diff)
fixed bugs regarding saving and restoring toolbar state
Diffstat (limited to 'muse2/muse/app.cpp')
-rw-r--r--muse2/muse/app.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 60075a1a..ba4d2487 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -3143,7 +3143,7 @@ void MusE::shareMenuAndToolbarChanged(TopWin* win, bool val)
{
if (win == currentMenuSharingTopwin)
{
- if (win != activeTopWin)
+ if (activeTopWin && (win != activeTopWin) && (activeTopWin->sharesToolsAndMenu()))
setCurrentMenuSharingTopwin(activeTopWin);
else
setCurrentMenuSharingTopwin(NULL);