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();
m_activeMonitor = name;
}
-void MonitorManager::switchMonitors()
+void MonitorManager::slotSwitchMonitors()
{
- if (m_blocked) return;
+ if (m_blocked || m_clipMonitor == NULL) return;
if (m_clipMonitor->isActive()) {
m_clipMonitor->stop();
m_projectMonitor->start();
{
if (m_blocked) return;
m_timecode = tc;
- QTimer::singleShot(300, this, SLOT(slotResetProfiles()));
+ slotResetProfiles();
+ //QTimer::singleShot(300, this, SLOT(slotResetProfiles()));
}
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);
}