Skip to content

Commit 4affa92

Browse files
Fixed crash selecting texttool (flameshot-org#2369)
1 parent 77ccac5 commit 4affa92

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/widgets/capture/capturewidget.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1113,14 +1113,13 @@ void CaptureWidget::setState(CaptureToolButton* b)
11131113

11141114
if (b->tool()->isSelectable()) {
11151115
if (m_activeButton != b) {
1116-
QWidget* confW = b->tool()->configurationWidget();
1117-
m_panel->setToolWidget(confW);
11181116
if (m_activeButton) {
11191117
m_activeButton->setColor(m_uiColor);
11201118
}
11211119
m_activeButton = b;
11221120
m_activeButton->setColor(m_contrastUiColor);
11231121
m_panel->setActiveLayer(-1);
1122+
m_panel->setToolWidget(b->tool()->configurationWidget());
11241123
} else if (m_activeButton) {
11251124
m_panel->clearToolWidget();
11261125
m_activeButton->setColor(m_uiColor);

src/widgets/panel/utilitypanel.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ QWidget* UtilityPanel::toolWidget() const
5656
void UtilityPanel::setToolWidget(QWidget* w)
5757
{
5858
if (m_toolWidget) {
59-
m_toolWidget->close();
60-
delete m_toolWidget;
61-
m_toolWidget = nullptr;
59+
m_toolWidget->hide();
60+
m_toolWidget->setParent(this);
61+
m_toolWidget->deleteLater();
6262
}
6363
if (w) {
6464
m_toolWidget = w;

0 commit comments

Comments
 (0)