Commit 8ac4374b authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix moving clip group before another clip broken

parent 5993f95c
...@@ -2361,7 +2361,7 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i ...@@ -2361,7 +2361,7 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i
if (getTrackById_const(current_track_id)->hasStartMix(item.first)) { if (getTrackById_const(current_track_id)->hasStartMix(item.first)) {
subPlaylist = m_allClips[item.first]->getSubPlaylistIndex(); subPlaylist = m_allClips[item.first]->getSubPlaylistIndex();
} }
if (!getTrackById_const(current_track_id)->isAvailable(target_position, current_in - target_position, subPlaylist)) { if (!getTrackById_const(current_track_id)->isAvailable(target_position, playtime, subPlaylist)) {
if (!getTrackById_const(current_track_id)->isBlankAt(current_in - 1)) { if (!getTrackById_const(current_track_id)->isBlankAt(current_in - 1)) {
// No move possible, abort // No move possible, abort
bool undone = local_undo(); bool undone = local_undo();
...@@ -2403,7 +2403,6 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i ...@@ -2403,7 +2403,6 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i
break; break;
} }
} }
sync_mix(); sync_mix();
PUSH_LAMBDA(sync_mix, local_redo); PUSH_LAMBDA(sync_mix, local_redo);
if (ok) { if (ok) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment