From 26fdc09ae5ec0618cb463e896c67fbfc803e8644 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Wed, 10 Apr 2019 21:32:40 +0200
Subject: [PATCH] Fix some qml startup warnings

---
 src/monitor/glwidget.cpp   | 4 +++-
 src/monitor/monitor.cpp    | 3 ++-
 src/monitor/qmlmanager.cpp | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/monitor/glwidget.cpp b/src/monitor/glwidget.cpp
index a6a76188e..c809a6990 100644
--- a/src/monitor/glwidget.cpp
+++ b/src/monitor/glwidget.cpp
@@ -130,7 +130,7 @@ GLWidget::GLWidget(int id, QObject *parent)
     m_blackClip->set("out", 3);
     connect(&m_refreshTimer, &QTimer::timeout, this, &GLWidget::refresh);
     m_producer = m_blackClip;
-
+    rootContext()->setContextProperty("markersModel", 0);
     if (!initGPUAccel()) {
         disableGPUAccel();
     }
@@ -956,6 +956,8 @@ int GLWidget::setProducer(const std::shared_ptr<Mlt::Producer> &producer, bool i
             removeAudioOverlay();
         }
         m_producer = m_blackClip;
+        // Reset markersModel
+        rootContext()->setContextProperty("markersModel", 0);
     }
     // redundant check. postcondition of above is m_producer != null
     if (m_producer) {
diff --git a/src/monitor/monitor.cpp b/src/monitor/monitor.cpp
index 65705bf38..9e6a8440d 100644
--- a/src/monitor/monitor.cpp
+++ b/src/monitor/monitor.cpp
@@ -1353,7 +1353,6 @@ void Monitor::slotOpenClip(const std::shared_ptr<ProjectClip> &controller, int i
         disconnect(m_controller->getMarkerModel().get(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SLOT(checkOverlay()));
     }
     m_controller = controller;
-    loadQmlScene(MonitorSceneDefault);
     m_snaps.reset(new SnapModel());
     m_glMonitor->getControllerProxy()->resetZone();
     if (controller) {
@@ -1367,6 +1366,7 @@ void Monitor::slotOpenClip(const std::shared_ptr<ProjectClip> &controller, int i
             return;
         }
         m_glMonitor->setRulerInfo((int)m_controller->frameDuration(), controller->getMarkerModel());
+        loadQmlScene(MonitorSceneDefault);
         m_timePos->setRange(0, (int)m_controller->frameDuration());
         updateMarkers();
         connect(m_glMonitor->getControllerProxy(), &MonitorProxy::addSnap, this, &Monitor::addSnapPoint, Qt::DirectConnection);
@@ -1389,6 +1389,7 @@ void Monitor::slotOpenClip(const std::shared_ptr<ProjectClip> &controller, int i
         m_glMonitor->getControllerProxy()->setClipHasAV(controller->hasAudioAndVideo());
         // hasEffects =  controller->hasEffects();
     } else {
+        loadQmlScene(MonitorSceneDefault);
         m_glMonitor->setProducer(nullptr, isActive());
         m_glMonitor->setAudioThumb();
         m_audioMeterWidget->audioChannels = 0;
diff --git a/src/monitor/qmlmanager.cpp b/src/monitor/qmlmanager.cpp
index 803f8f952..2aa3ad8db 100644
--- a/src/monitor/qmlmanager.cpp
+++ b/src/monitor/qmlmanager.cpp
@@ -62,6 +62,8 @@ void QmlManager::setScene(Kdenlive::MonitorId id, MonitorSceneType type, QSize p
     }
     m_sceneType = type;
     QQuickItem *root = nullptr;
+    const QFont ft = QFontDatabase::systemFont(QFontDatabase::FixedFont);
+    m_view->rootContext()->setContextProperty("fixedFont", ft);
     switch (type) {
     case MonitorSceneGeometry:
         m_view->setSource(QUrl(QStringLiteral("qrc:/qml/kdenlivemonitoreffectscene.qml")));
@@ -117,8 +119,6 @@ void QmlManager::setScene(Kdenlive::MonitorId id, MonitorSceneType type, QSize p
     if (root && duration > 0) {
         root->setProperty("duration", duration);
     }
-    const QFont ft = QFontDatabase::systemFont(QFontDatabase::FixedFont);
-    m_view->rootContext()->setContextProperty("fixedFont", ft);
 }
 
 void QmlManager::effectRectChanged()
-- 
GitLab