summaryrefslogtreecommitdiff
path: root/muse2/muse/app.cpp
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-10-16 08:03:59 +0000
committerTim E. Real <termtech@rogers.com>2010-10-16 08:03:59 +0000
commit97a2927e036b484408d493dfb80150fc2b88f1c2 (patch)
treef0cc553d1820def6479a8134d472ebcd67a379cc /muse2/muse/app.cpp
parentc6cbd8ded4ba8b52aa980f2ea4138179697ec9bb (diff)
See ChangeLog
Diffstat (limited to 'muse2/muse/app.cpp')
-rw-r--r--muse2/muse/app.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 8aa558c0..761df24e 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -2028,6 +2028,13 @@ void MusE::updateRouteMenus(Track* track, QObject* master) // p3.3.50
if(pup->count() == 0)
return;
+ // p4.0.1 Protection since reverting to regular (self-extinguishing) menu behaviour here in muse2.
+ if(!pup->isVisible())
+ {
+ //printf("MusE::updateRouteMenus menu is not visible\n");
+ return;
+ }
+
//AudioTrack* t = (AudioTrack*)track;
RouteList* rl = gIsOutRoutingPopupMenu ? track->outRoutes() : track->inRoutes();
@@ -2475,8 +2482,13 @@ void MusE::routingPopupMenuAboutToHide()
//PopupMenu* pup = muse->getRoutingPopupMenu();
//pup->disconnect();
//pup->clear();
- gRoutingMenuMap.clear();
- gRoutingPopupMenuMaster = 0;
+
+ // p4.0.1 Removed. IIRC These lines were not strictly necessary in muse-1,
+ // and here in muse-2 we reverted back to regular Q3PopupMenu behaviour for now,
+ // which is self-extinguishing, so these lines cannot be enabled -
+ // gRoutingPopupMenuMaster and gRoutingMenuMap are required for routingPopupMenuActivated().
+ //gRoutingMenuMap.clear();
+ //gRoutingPopupMenuMaster = 0;
}
//---------------------------------------------------------