Fix video stream disabled on profile change or reload clip

parent 0c5e4ea1
Pipeline #20766 passed with stage
in 9 minutes and 12 seconds
......@@ -1636,7 +1636,7 @@ void MainWindow::setupActions()
QAction *switchTrackTarget = new QAction(QIcon(), i18n("Switch Track Target Audio Stream"), this);
connect(switchTrackTarget, &QAction::triggered, this, &MainWindow::slotSwitchTrackAudioStream);
timelineActions->addAction(QStringLiteral("switch_target_stream"), switchTrackTarget);
switchTrackTarget->setShortcut(Qt::Key_Apostrophe);
actionCollection()->setDefaultShortcut(switchTrackTarget, Qt::Key_Apostrophe);
QAction *deleteTrack = new QAction(QIcon(), i18n("Delete Track"), this);
connect(deleteTrack, &QAction::triggered, this, &MainWindow::slotDeleteTrack);
......
......@@ -364,13 +364,13 @@ void ClipController::updateProducer(const std::shared_ptr<Mlt::Producer> &produc
*m_masterProducer = producer.get();
m_properties = new Mlt::Properties(m_masterProducer->get_properties());
m_producerLock.unlock();
setProducerProperty(QStringLiteral("kdenlive:id"), m_controllerBinId);
checkAudioVideo();
// Pass properties from previous producer
m_properties->pass_list(passProperties, passList);
if (!m_masterProducer->is_valid()) {
qCDebug(KDENLIVE_LOG) << "// WARNING, USING INVALID PRODUCER";
} else {
// Pass properties from previous producer
m_properties->pass_list(passProperties, passList);
checkAudioVideo();
setProducerProperty(QStringLiteral("kdenlive:id"), m_controllerBinId);
m_effectStack->resetService(m_masterProducer);
emitProducerChanged(m_controllerBinId, producer);
// URL and name should not be updated otherwise when proxying a clip we cannot find back the original url
......
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