Fixed crash selecting texttool (flameshot-org#2369)

(cherry picked from commit 4affa92)
namecheap · May 13, 2022 · fb86f8d · fb86f8d
1 parent 3510771
commit fb86f8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp
@@ -1113,14 +1113,13 @@ void CaptureWidget::setState(CaptureToolButton* b)
 
     if (b->tool()->isSelectable()) {
         if (m_activeButton != b) {
-            QWidget* confW = b->tool()->configurationWidget();
-            m_panel->setToolWidget(confW);
             if (m_activeButton) {
                 m_activeButton->setColor(m_uiColor);
             }
             m_activeButton = b;
             m_activeButton->setColor(m_contrastUiColor);
             m_panel->setActiveLayer(-1);
+            m_panel->setToolWidget(b->tool()->configurationWidget());
         } else if (m_activeButton) {
             m_panel->clearToolWidget();
             m_activeButton->setColor(m_uiColor);

diff --git a/src/widgets/panel/utilitypanel.cpp b/src/widgets/panel/utilitypanel.cpp
@@ -56,9 +56,9 @@ QWidget* UtilityPanel::toolWidget() const
 void UtilityPanel::setToolWidget(QWidget* w)
 {
     if (m_toolWidget) {
-        m_toolWidget->close();
-        delete m_toolWidget;
-        m_toolWidget = nullptr;
+        m_toolWidget->hide();
+        m_toolWidget->setParent(this);
+        m_toolWidget->deleteLater();
     }
     if (w) {
         m_toolWidget = w;