From 69d399105a1aeca79a496555192b7b678e9b93d7 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 29 Apr 2020 01:24:21 +1000
Subject: [PATCH] manageddisplaywidgets: fixed issue that caused buffers to be
 drawn on the main window

---
 app/widget/manageddisplay/manageddisplay.cpp |  6 ++++--
 app/widget/scope/waveform/waveform.cpp       |  4 ----
 app/widget/viewer/manageddisplayobject.cpp   |  6 ------
 app/widget/viewer/manageddisplayobject.h     | 11 -----------
 4 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 app/widget/viewer/manageddisplayobject.cpp
 delete mode 100644 app/widget/viewer/manageddisplayobject.h

diff --git a/app/widget/manageddisplay/manageddisplay.cpp b/app/widget/manageddisplay/manageddisplay.cpp
index 63cb2dd69..8d3d720fe 100644
--- a/app/widget/manageddisplay/manageddisplay.cpp
+++ b/app/widget/manageddisplay/manageddisplay.cpp
@@ -142,9 +142,13 @@ void ManagedDisplayWidget::MenuLookSelect(QAction *action)
 
 void ManagedDisplayWidget::SetColorTransform(const ColorTransform &transform)
 {
+  makeCurrent();
+
   color_transform_ = transform;
   SetupColorProcessor();
   ColorProcessorChangedEvent();
+
+  doneCurrent();
 }
 
 void ManagedDisplayWidget::initializeGL()
@@ -248,9 +252,7 @@ void ManagedDisplayWidget::SetupColorProcessor()
                                                     color_manager_->GetReferenceColorSpace(),
                                                     color_transform_);
 
-      makeCurrent();
       color_service_->Enable(context(), true);
-      doneCurrent();
 
     } catch (OCIO::Exception& e) {
 
diff --git a/app/widget/scope/waveform/waveform.cpp b/app/widget/scope/waveform/waveform.cpp
index 043820eb7..0ce873bc5 100644
--- a/app/widget/scope/waveform/waveform.cpp
+++ b/app/widget/scope/waveform/waveform.cpp
@@ -60,8 +60,6 @@ void WaveformScope::initializeGL()
 {
   ManagedDisplayWidget::initializeGL();
 
-  makeCurrent();
-
   pipeline_ = OpenGLShader::Create();
   pipeline_->create();
   pipeline_->addShaderFromSourceCode(QOpenGLShader::Vertex, OpenGLShader::CodeDefaultVertex());
@@ -70,8 +68,6 @@ void WaveformScope::initializeGL()
 
   framebuffer_.Create(context());
 
-  doneCurrent();
-
   connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &WaveformScope::CleanUp, Qt::DirectConnection);
 
   UploadTextureFromBuffer();
diff --git a/app/widget/viewer/manageddisplayobject.cpp b/app/widget/viewer/manageddisplayobject.cpp
deleted file mode 100644
index f7541ca3f..000000000
--- a/app/widget/viewer/manageddisplayobject.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "manageddisplayobject.h"
-
-ManagedDisplayObject::ManagedDisplayObject()
-{
-
-}
diff --git a/app/widget/viewer/manageddisplayobject.h b/app/widget/viewer/manageddisplayobject.h
deleted file mode 100644
index 11de19c12..000000000
--- a/app/widget/viewer/manageddisplayobject.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef MANAGEDDISPLAYOBJECT_H
-#define MANAGEDDISPLAYOBJECT_H
-
-
-class ManagedDisplayObject
-{
-public:
-  ManagedDisplayObject();
-};
-
-#endif // MANAGEDDISPLAYOBJECT_H