Fix timeline move with Qt 4.6

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index b52c4dbd6106a40cacbb7d5cffa5819a48eb5dbf..0656a4d865e5878c65cfcc94107d4cf66bab1d4d 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -50,7 +50,7 @@ void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor)
 
 void MonitorManager::activateMonitor(QString name)
 {
-    if (m_blocked) return;
+    if (m_blocked || m_clipMonitor == NULL) return;
     if (m_activeMonitor == name) return;
     if (name == "clip") {
         m_projectMonitor->stop();
@@ -67,7 +67,7 @@ void MonitorManager::activateMonitor(QString name)
 
 void MonitorManager::switchMonitors()
 {
-    if (m_blocked) return;
+    if (m_blocked || m_clipMonitor == NULL) return;
     if (m_clipMonitor->isActive()) {
         m_clipMonitor->stop();
         m_projectMonitor->start();
@@ -159,7 +159,8 @@ void MonitorManager::resetProfiles(Timecode tc)
 {
     if (m_blocked) return;
     m_timecode = tc;
-    QTimer::singleShot(300, this, SLOT(slotResetProfiles()));
+    slotResetProfiles();
+    //QTimer::singleShot(300, this, SLOT(slotResetProfiles()));
 }
 
 void MonitorManager::slotResetProfiles()
@@ -167,9 +168,9 @@ void MonitorManager::slotResetProfiles()
     if (m_blocked) return;
     if (m_projectMonitor == NULL || m_clipMonitor == NULL) return;
     activateMonitor("clip");
-    m_clipMonitor->resetProfile();
+    m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
     activateMonitor("project");
-    m_projectMonitor->resetProfile();
+    m_projectMonitor->resetProfile(KdenliveSettings::current_profile());
     //m_projectMonitor->refreshMonitor(true);
 }