Commit 580efc69 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix remove space in all tracks with locked tracks.

Fixes #1158
parent 0d7dd3b6
......@@ -1979,13 +1979,15 @@ bool TimelineFunctions::requestDeleteBlankAt(const std::shared_ptr<TimelineItemM
if (affectAllTracks) {
int lastFrame = 0;
for (const auto &track: timeline->m_allTracks) {
lastFrame = track->getBlankStart(position);
if (lastFrame > spaceStart) {
spaceStart = lastFrame;
if (!track->isLocked()) {
lastFrame = track->getBlankStart(position);
if (lastFrame > spaceStart) {
spaceStart = lastFrame;
}
}
}
// check subtitle track
if (timeline->getSubtitleModel()) {
if (timeline->getSubtitleModel() && !timeline->getSubtitleModel()->isLocked()) {
lastFrame = timeline->getSubtitleModel()->getBlankStart(position);
if (lastFrame > spaceStart) {
spaceStart = lastFrame;
......
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