Fix dropframe timecode, patch from John T. Mertz

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index fbb506dabb4bc53ddb51526adc22041606253738..9348c9de88e1a1026d0b53c299404cf3092bcebc 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -62,15 +62,15 @@ void MonitorManager::activateMonitor(QString name)
     m_activeMonitor = name;
 }
 
-void MonitorManager::slotSwitchMonitors()
+void MonitorManager::slotSwitchMonitors(bool activateClip)
 {
     if (m_blocked || m_clipMonitor == NULL) return;
-    if (m_clipMonitor->isActive()) {
+    if (!activateClip && m_clipMonitor->isActive()) {
         m_clipMonitor->stop();
         m_projectMonitor->start();
         m_activeMonitor = m_projectMonitor->name();
         emit raiseClipMonitor(false);
-    } else {
+    } else if (activateClip && m_projectMonitor->isActive()) {
         m_projectMonitor->stop();
         m_clipMonitor->start();
         m_activeMonitor = m_clipMonitor->name();
@@ -165,8 +165,10 @@ void MonitorManager::slotResetProfiles()
     if (m_projectMonitor == NULL || m_clipMonitor == NULL) return;
     activateMonitor("clip");
     m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
+    m_clipMonitor->updateTimecodeFormat();
     activateMonitor("project");
     m_projectMonitor->resetProfile(KdenliveSettings::current_profile());
+    m_projectMonitor->updateTimecodeFormat();
     //m_projectMonitor->refreshMonitor(true);
 }