From b5bd73c31406ef4b2202a3b40c1fca665713ade3 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 29 Oct 2022 10:05:09 -0700 Subject: [PATCH] viewer: destroy text edit explicitly Fix assert failure --- app/widget/viewer/viewerdisplay.cpp | 7 +++++++ app/widget/viewer/viewerdisplay.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp index c114b6620..fcbc6553d 100644 --- a/app/widget/viewer/viewerdisplay.cpp +++ b/app/widget/viewer/viewerdisplay.cpp @@ -81,6 +81,13 @@ ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) : inner_widget()->setAcceptDrops(true); } +ViewerDisplayWidget::~ViewerDisplayWidget() +{ + delete text_edit_; + + MANAGEDDISPLAYWIDGET_DEFAULT_DESTRUCTOR_INNER; +} + void ViewerDisplayWidget::SetMatrixTranslate(const QMatrix4x4 &mat) { translate_matrix_ = mat; diff --git a/app/widget/viewer/viewerdisplay.h b/app/widget/viewer/viewerdisplay.h index f2e89102f..a82bad747 100644 --- a/app/widget/viewer/viewerdisplay.h +++ b/app/widget/viewer/viewerdisplay.h @@ -68,7 +68,7 @@ public: */ ViewerDisplayWidget(QWidget* parent = nullptr); - MANAGEDDISPLAYWIDGET_DEFAULT_DESTRUCTOR(ViewerDisplayWidget) + virtual ~ViewerDisplayWidget() override; const ViewerSafeMarginInfo& GetSafeMargin() const; void SetSafeMargins(const ViewerSafeMarginInfo& safe_margin);