# HG changeset patch # User Chris Cannam # Date 1276599255 0 # Node ID e0c7ee104eb48c5175ee2cba0b5dcc6c0f6f701a # Parent 1fc7ee4ff50672f74a3ce8fabfeef76a94c5eb65 * Fix duplicate entries on right-button Layer menu when more than one audio file is loaded diff -r 1fc7ee4ff506 -r e0c7ee104eb4 main/MainWindow.cpp --- a/main/MainWindow.cpp Wed May 05 16:21:44 2010 +0000 +++ b/main/MainWindow.cpp Tue Jun 15 10:54:15 2010 +0000 @@ -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;