From 8c2a18a0cb56f8e540672272427c5c123f6e61f4 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sun, 31 Jan 2010 23:03:59 +0000
Subject: [PATCH] Small cleanup in monitors

svn path=/trunk/kdenlive/; revision=4262
---
 src/mainwindow.cpp     | 2 +-
 src/monitor.cpp        | 2 +-
 src/monitormanager.cpp | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 93e32f56..9274d5af 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1675,9 +1675,9 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale)
 
     if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false);
     slotGotProgressInfo(QString(), -1);
-    m_clipMonitor->refreshMonitor(true);
     m_projectMonitor->adjustRulerSize(trackView->duration());
     m_projectMonitor->slotZoneMoved(trackView->inPoint(), trackView->outPoint());
+    m_clipMonitor->refreshMonitor(true);
 }
 
 void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles)
diff --git a/src/monitor.cpp b/src/monitor.cpp
index ba4e8f53..b366f6d4 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -750,7 +750,7 @@ void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position)
     if (render == NULL) return;
     if (clip == NULL && m_currentClip != NULL) {
         m_currentClip = NULL;
-	m_length = -1;
+        m_length = -1;
         render->setProducer(NULL, -1);
         return;
     }
diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index b8827fac..fbb506da 100644
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -57,7 +57,6 @@ void MonitorManager::activateMonitor(QString name)
     } else {
         m_clipMonitor->stop();
         m_projectMonitor->start();
-        m_projectMonitor->raise();
         emit raiseClipMonitor(false);
     }
     m_activeMonitor = name;
@@ -69,7 +68,6 @@ void MonitorManager::slotSwitchMonitors()
     if (m_clipMonitor->isActive()) {
         m_clipMonitor->stop();
         m_projectMonitor->start();
-        m_projectMonitor->raise();
         m_activeMonitor = m_projectMonitor->name();
         emit raiseClipMonitor(false);
     } else {
-- 
2.39.2