Re-enable monitor overlay info & fix openGL crash

[kdenlive] / src / abstractmonitor.cpp

diff --git a/src/abstractmonitor.cpp b/src/abstractmonitor.cpp
index c41569cc69e713f2abce332438f92791070a25cc..b1b3875c67577330ec83ba99c481ef58da014660 100644 (file)
--- a/src/abstractmonitor.cpp
+++ b/src/abstractmonitor.cpp
@@ -31,8 +31,8 @@
 
 AbstractMonitor::AbstractMonitor(Kdenlive::MONITORID id, MonitorManager *manager, QWidget *parent): 
     QWidget(parent),
-    m_id(id),
     videoSurface(NULL),
+    m_id(id),
     m_monitorManager(manager)
 {
     videoBox = new VideoContainer(this);
@@ -59,9 +59,9 @@ bool AbstractMonitor::isActive() const
     return m_monitorManager->isActive(m_id);
 }
 
-bool AbstractMonitor::slotActivateMonitor()
+bool AbstractMonitor::slotActivateMonitor(bool forceRefresh)
 {
-    return m_monitorManager->activateMonitor(m_id);
+    return m_monitorManager->activateMonitor(m_id, forceRefresh);
 }
 
 VideoContainer::VideoContainer(AbstractMonitor* monitor, QWidget *parent) :
@@ -169,7 +169,7 @@ VideoSurface::VideoSurface(QWidget* parent) :
     setAttribute(Qt::WA_OpaquePaintEvent);
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     setAttribute(Qt::WA_NoSystemBackground);
-    setUpdatesEnabled(false);
+    //setUpdatesEnabled(false);
 }
 
 void VideoSurface::paintEvent(QPaintEvent *event)