From 95b7c9770cbbba91dd32078309a9e9ca700f26d8 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 1 May 2020 02:04:26 +1000 Subject: [PATCH] manageddisplay: fixed segfault when closing exportdialog Really affected any color managed display widget, including scopes, viewers, and the export dialog. --- app/widget/manageddisplay/manageddisplay.cpp | 5 +++++ app/widget/manageddisplay/manageddisplay.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/app/widget/manageddisplay/manageddisplay.cpp b/app/widget/manageddisplay/manageddisplay.cpp index 8d3d720fe..2208dfeb8 100644 --- a/app/widget/manageddisplay/manageddisplay.cpp +++ b/app/widget/manageddisplay/manageddisplay.cpp @@ -32,6 +32,11 @@ ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent) : setContextMenuPolicy(Qt::CustomContextMenu); } +ManagedDisplayWidget::~ManagedDisplayWidget() +{ + ContextCleanup(); +} + void ManagedDisplayWidget::ConnectColorManager(ColorManager *color_manager) { if (color_manager_ == color_manager) { diff --git a/app/widget/manageddisplay/manageddisplay.h b/app/widget/manageddisplay/manageddisplay.h index e0e3e3b3e..697247129 100644 --- a/app/widget/manageddisplay/manageddisplay.h +++ b/app/widget/manageddisplay/manageddisplay.h @@ -35,6 +35,8 @@ class ManagedDisplayWidget : public QOpenGLWidget public: ManagedDisplayWidget(QWidget* parent = nullptr); + virtual ~ManagedDisplayWidget() override; + /** * @brief Disconnect a ColorManager (equivalent to ConnectColorManager(nullptr)) */