[Sv1-commits] SF.net SVN: sv1:[1714] sonic-visualiser/trunk/sv/main/MainWindow.cpp

[<ca...@us...>]

Revision: 1714
          http://sv1.svn.sourceforge.net/sv1/?rev=1714&view=rev
Author:   cannam
Date:     2010-06-15 10:54:15 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------

* Fix duplicate entries on right-button Layer menu when more than one audio
  file is loaded

Modified Paths:
--------------
    sonic-visualiser/trunk/sv/main/MainWindow.cpp

Modified: sonic-visualiser/trunk/sv/main/MainWindow.cpp
===================================================================
--- sonic-visualiser/trunk/sv/main/MainWindow.cpp	2010-06-15 10:48:28 UTC (rev 1713)
+++ sonic-visualiser/trunk/sv/main/MainWindow.cpp	2010-06-15 10:54:15 UTC (rev 1714)
@@ -331,14 +331,6 @@
 //        m_rightButtonMenu->setTearOffEnabled(true);
     }
 
-    if (m_rightButtonLayerMenu) {
-        m_rightButtonLayerMenu->clear();
-    } else {
-        m_rightButtonLayerMenu = m_rightButtonMenu->addMenu(tr("&Layer"));
-        m_rightButtonLayerMenu->setTearOffEnabled(true);
-        m_rightButtonMenu->addSeparator();
-    }
-
     if (m_rightButtonTransformsMenu) {
         m_rightButtonTransformsMenu->clear();
     } else {
@@ -906,6 +898,14 @@
         m_layerMenu->setTearOffEnabled(true);
     }
 
+    if (m_rightButtonLayerMenu) {
+        m_rightButtonLayerMenu->clear();
+    } else {
+        m_rightButtonLayerMenu = m_rightButtonMenu->addMenu(tr("&Layer"));
+        m_rightButtonLayerMenu->setTearOffEnabled(true);
+        m_rightButtonMenu->addSeparator();
+    }
+
     QMenu *menu = m_paneMenu;
 
     IconLoader il;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.