From 2fb1b5732ce88caa318c701944c1257dc612caf1 Mon Sep 17 00:00:00 2001 From: Robert Jonsson Date: Sun, 8 Jul 2012 22:15:41 +0000 Subject: fixed bug with track deletion dialog --- muse2/muse/arranger/arrangerview.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp index 9c24c7ce..9641ab2e 100644 --- a/muse2/muse/arranger/arrangerview.cpp +++ b/muse2/muse/arranger/arrangerview.cpp @@ -492,21 +492,19 @@ void ArrangerView::cmd(int cmd) arranger->cmd(Arranger::CMD_INSERT_EMPTYMEAS); break; case CMD_DELETE: + if (!MusEGlobal::song->msgRemoveParts()) //automatically does undo if neccessary and returns true then { QMessageBox::StandardButton btn = QMessageBox::warning( this,tr("Remove track(s)"),tr("Are you sure you want to remove this track(s)?"), QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Ok); if (btn == QMessageBox::Cancel) - break; - if (!MusEGlobal::song->msgRemoveParts()) //automatically does undo if neccessary and returns true then - { - //msgRemoveParts() returned false -> no parts to remove? - MusEGlobal::song->startUndo(); - MusEGlobal::audio->msgRemoveTracks(); //TODO FINDME this could still be speeded up! - MusEGlobal::song->endUndo(SC_TRACK_REMOVED); - } + break; //msgRemoveParts() returned false -> no parts to remove? + MusEGlobal::song->startUndo(); + MusEGlobal::audio->msgRemoveTracks(); //TODO FINDME this could still be speeded up! + MusEGlobal::song->endUndo(SC_TRACK_REMOVED); } + break; case CMD_DELETE_TRACK: // from menu { -- cgit v1.2.3