Commit 9aca0ee7 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix play action not pausing when switching between subclips

parent f5404022
......@@ -1345,7 +1345,6 @@ void Monitor::slotOpenClip(ClipController *controller, int in, int out)
if (render == NULL) {
return;
}
bool sameClip = controller == m_controller && controller != NULL;
m_controller = controller;
if (!m_glMonitor->isVisible()) {
// Don't load clip if monitor is not active (disabled)
......@@ -1357,11 +1356,9 @@ void Monitor::slotOpenClip(ClipController *controller, int in, int out)
return;
}
updateMarkers();
if (!sameClip) {
// Loading new clip, stop if playing
if (m_playAction->isActive()) {
m_playAction->setActive(false);
}
// Loading new clip / zone, stop if playing
if (m_playAction->isActive()) {
m_playAction->setActive(false);
}
render->setProducer(m_controller->masterProducer(), in, isActive());
if (out > -1) {
......
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