Commit 70bd964f authored by Julius Künzel's avatar Julius Künzel
Browse files

Stop trimming mode (internal) only if it is running

Fixes playback stoping on selection change and maybe others
parent a06cefed
Pipeline #78417 canceled with stage
......@@ -2431,7 +2431,6 @@ void Monitor::processSeek(int pos, bool noAudioScrub)
if (KdenliveSettings::pauseonseek()) {
pause();
}
//noAudioScrub = noAudioScrub || pCore->window()->getCurrentTimeline()->controller()->trimmingActive();
m_glMonitor->requestSeek(pos, noAudioScrub);
emit m_monitorManager->cleanMixer();
}
......
......@@ -2183,8 +2183,10 @@ bool TimelineController::requestStartTrimmingMode(int mainClipId, bool onlyCurre
}
void TimelineController::requestEndTrimmingMode() {
pCore->monitorManager()->projectMonitor()->setProducer(pCore->window()->getCurrentTimeline()->model()->producer(), 0);
pCore->monitorManager()->projectMonitor()->slotSwitchTrimming(false);
if (pCore->monitorManager()->isTrimming()) {
pCore->monitorManager()->projectMonitor()->setProducer(pCore->window()->getCurrentTimeline()->model()->producer(), 0);
pCore->monitorManager()->projectMonitor()->slotSwitchTrimming(false);
}
}
void TimelineController::addPreviewRange(bool add)
......
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