Commits

Anonymous committed 9526814

Fix clip monitor not activated on open: http://kdenlive.org/mantis/view.php?id=2992

Comments (0)

Files changed (3)

src/mainwindow.cpp

 #endif
     //Update the mouse position display so it will display in DF/NDF format by default based on the project setting.
     slotUpdateMousePosition(0);
-    m_monitorManager->activateMonitor(Kdenlive::clipMonitor);
+    m_monitorManager->activateMonitor(Kdenlive::clipMonitor, true);
     // set tool to select tool
     m_buttonSelectTool->setChecked(true);
 }
 void Monitor::updateClipProducer(Mlt::Producer *prod)
 {
     if (render == NULL) return;
-   render->setProducer(prod, render->seekFramePosition());
+    render->setProducer(prod, render->seekFramePosition());
 }
 
 void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpdate, int position)
     if (render == NULL) return;
     if (clip == NULL && m_currentClip != NULL) {
 	m_currentClip->lastSeekPosition = render->seekFramePosition();
-        kDebug()<<"// SETTING NULL CLIP MONITOR";
         m_currentClip = NULL;
         m_length = -1;
         render->setProducer(NULL, -1);
         if (render->setProducer(prod, position) == -1) {
             // MLT CONSUMER is broken
             kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
-        }
+        } else start();
     } else {
         if (m_currentClip) {
             slotActivateMonitor();

src/projectlist.cpp

         return;
     }
     if (replace) toReload = clipId;
-    if (!toReload.isEmpty())
+    if (!toReload.isEmpty()) {
         emit clipNeedsReload(toReload);
+    }
 }
 
 bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)