Try to fix monitor confusion: http://kdenlive.org/mantis/view.php?id=2986

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 8a065bf09ed415c29cbadb90d51942c55da3eab5..ca23d9a31eef1de787dd8f1cb7bce9b27babee99 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -53,6 +53,9 @@ void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor,
 {
     m_clipMonitor = clipMonitor;
     m_projectMonitor = projectMonitor;
+    
+    connect(m_clipMonitor->render, SIGNAL(activateMonitor(Kdenlive::MONITORID)), this, SLOT(activateMonitor(Kdenlive::MONITORID)));
+    connect(m_projectMonitor->render, SIGNAL(activateMonitor(Kdenlive::MONITORID)), this, SLOT(activateMonitor(Kdenlive::MONITORID)));
 
     m_monitorsList.append(clipMonitor);
     m_monitorsList.append(projectMonitor);
@@ -99,8 +102,9 @@ bool MonitorManager::activateMonitor(Kdenlive::MONITORID name, bool forceRefresh
     if (m_activeMonitor) {
         m_activeMonitor->blockSignals(true);
         m_activeMonitor->parentWidget()->raise();
+       m_activeMonitor->blockSignals(false);
         m_activeMonitor->start();
-        m_activeMonitor->blockSignals(false);
+        
     }
     emit checkColorScopes();
     return (m_activeMonitor != NULL);