summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2012-07-08 22:15:41 +0000
committerRobert Jonsson <spamatica@gmail.com>2012-07-08 22:15:41 +0000
commit2fb1b5732ce88caa318c701944c1257dc612caf1 (patch)
treed20d6691d4379b7ccc648774494074a414b08d14
parent7926d216fc1f483b2cfb9b368ea3ae45c3ff8463 (diff)
fixed bug with track deletion dialog
-rw-r--r--muse2/muse/arranger/arrangerview.cpp14
1 files 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
{