Please see ChangeLog.

3 files changed, 23 insertions, 17 deletions

diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index 9921c2cd..efcb8e84 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -593,7 +593,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
             val = event.dataB();
             }
 
-      pop = new QMenu(this);
+      ///pop = new QMenu(this);
       //pop->setCheckable(false);//not necessary in Qt4
 
       MidiTrack* track   = part->track();
@@ -677,8 +677,8 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
 
 void EditCtrlDialog::newController()
       {
-      QMenu* pop = new QMenu(this);
-      //pop->setCheckable(this);//not necessary in Qt4
+      QMenu* pup = new QMenu(this);
+      //pup->setCheckable(this);//not necessary in Qt4
       //
       // populate popup with all controllers available for
       // current instrument
@@ -696,12 +696,12 @@ void EditCtrlDialog::newController()
       {
             if(cll->find(channel, ci->second->num()) == cll->end())
             {
-                    QAction* act = pop->addAction(ci->second->name());
+                    QAction* act = pup->addAction(ci->second->name());
 		    act->setData(nn);
 		    ++nn;
 	    }
       }
-      QAction* rv = pop->exec(buttonNewController->mapToGlobal(QPoint(0,0)));
+      QAction* rv = pup->exec(buttonNewController->mapToGlobal(QPoint(0,0)));
       if (rv) {
             QString s = rv->text();
             for (iMidiController ci = mcl->begin(); ci != mcl->end(); ++ci) {
@@ -733,7 +733,7 @@ void EditCtrlDialog::newController()
                         }
                   }
             }
-      delete pop;
+      delete pup;
       }
 //---------------------------------------------------------
 //   ctrlListClicked
@@ -841,16 +841,27 @@ void EditCtrlDialog::instrPopup()
       int channel = track->outChannel();
       int port    = track->outPort();
       MidiInstrument* instr = midiPorts[port].instrument();
-      instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM);
+      
+      ///instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM);
+      QMenu* pup = new QMenu(this);
+      instr->populatePatchPopup(pup, channel, song->mtype(), track->type() == Track::DRUM);
 
-      if(pop->actions().count() == 0)
+      ///if(pop->actions().count() == 0)
+      ///  return;
+      if(pup->actions().count() == 0)
+      {
+        delete pup;
         return;
-      QAction* rv = new QAction(pop->exec(patchName->mapToGlobal(QPoint(10,5))));
+      }  
+      
+      ///QAction* rv = pop->exec(patchName->mapToGlobal(QPoint(10,5)));
+      QAction* rv = pup->exec(patchName->mapToGlobal(QPoint(10,5)));
       if (rv) {
             val = rv->data().toInt();
             updatePatch();
             }
-      delete rv;
+            
+      delete pup;      
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/liste/editevent.h b/muse2/muse/liste/editevent.h
index bff39181..454e6a69 100644
--- a/muse2/muse/liste/editevent.h
+++ b/muse2/muse/liste/editevent.h
@@ -94,7 +94,7 @@ class EditCtrlDialog : public QDialog, public Ui::EditCtrlBase  {
       int val;          // controller value (for prog. changes)
 
       const MidiPart* part;
-      QMenu* pop;
+      ///QMenu* pop;
 
       void updatePatch();
 
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index 7df2c8bf..aeb6eb99 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -430,16 +430,11 @@ ListEdit::ListEdit(PartList* pl)
 
       //---------Pulldown Menu----------------------------
       
-      menuEdit = new QMenu(tr("&Edit"));
       QSignalMapper *editSignalMapper = new QSignalMapper(this);
     
-      menuBar()->addMenu(menuEdit);
+      menuEdit = menuBar()->addMenu(tr("&Edit"));
       menuEdit->addActions(undoRedo->actions());
 
-      ///Q3Accel* qa = new Q3Accel(this);
-      ///qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Z), song, SLOT(undo()));
-      ///qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Y), song, SLOT(redo()));
-
       menuEdit->addSeparator();
 #if 0
       QAction *cutAction = menuEdit->addAction(QIcon(*editcutIconSet), tr("Cut"));