Small cleanup in monitors

svn path=/trunk/kdenlive/; revision=4262

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 93e32f5661c7654e8ebab2d18a1c5a709c41ce57..9274d5af2e7e3df748cb181379cae1e56ab37e7e 100644 (file)
--- 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 ba4e8f53d1e46849956fd727866a94d075f45be3..b366f6d4a92bca7446f6bf3f26e18beee57c6a4b 100644 (file)
--- 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 b8827fac124f51932505a4aaf4d4661ce843f7e3..fbb506dabb4bc53ddb51526adc22041606253738 100644 (file)
--- 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 {