Fix buttons in capture monitor and crash when changing profile

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 1077967fe11bcb84389e389cb62aa712e57220b3..9bf6ce43cd37ec6dc8ba9d404fbfa2bc2bac98a8 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -184,6 +184,7 @@ void MonitorManager::slotResetProfiles()
 {
     if (m_blocked) return;
     if (m_projectMonitor == NULL || m_clipMonitor == NULL) return;
+    blockSignals(true);
     QString active = m_activeMonitor ? m_activeMonitor->name() : QString();
     activateMonitor("clip");
     m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
@@ -193,6 +194,9 @@ void MonitorManager::slotResetProfiles()
     m_projectMonitor->updateTimecodeFormat();
     //m_projectMonitor->refreshMonitor(true);
     if (!active.isEmpty()) activateMonitor(active);
+    blockSignals(false);
+    emit raiseMonitor(m_activeMonitor);
+    emit checkColorScopes();
 }
 
 void MonitorManager::slotRefreshCurrentMonitor()
@@ -212,6 +216,11 @@ void MonitorManager::slotUpdateAudioMonitoring()
     }
 }
 
+void MonitorManager::clearScopeSource()
+{
+    emit clearScopes();
+}
+
 void MonitorManager::updateScopeSource()
 {
     emit checkColorScopes();
@@ -219,7 +228,9 @@ void MonitorManager::updateScopeSource()
 
 AbstractRender *MonitorManager::activeRenderer()
 {
-    if (m_activeMonitor) return m_activeMonitor->abstractRender();
+    if (m_activeMonitor) {
+        return m_activeMonitor->abstractRender();
+    }
     return NULL;
 }