benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CloseOnLastWindow caused by tool change (#2645)

Browse Source 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2022-06-03 19:27:54 +02:00
committed by GitHub
parent 65e3a01360
commit 98c1b029e3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/text/texttool.cpp
View File

@@ -114,12 +114,12 @@ QWidget* TextTool::widget()
void TextTool::closeEditor()
{
if (!m_widget.isNull()) {
m_widget->close();
m_widget->hide();
delete m_widget;
m_widget = nullptr;
}
if (!m_confW.isNull()) {
m_confW->close();
m_confW->hide();
delete m_confW;
m_confW = nullptr;
}

6
src/widgets/capture/capturewidget.cpp
View File

@@ -439,7 +439,7 @@ void CaptureWidget::deleteToolWidgetOrClose()
m_panel->hide();
} else if (m_toolWidget) {
// delete toolWidget if exists
m_toolWidget->close();
m_toolWidget->hide();
delete m_toolWidget;
m_toolWidget = nullptr;
} else if (m_colorPicker && m_colorPicker->isVisible()) {
@@ -466,7 +466,7 @@ void CaptureWidget::releaseActiveTool()
m_activeTool = nullptr;
}
if (m_toolWidget) {
m_toolWidget->close();
m_toolWidget->hide();
delete m_toolWidget;
m_toolWidget = nullptr;
}
@@ -1180,7 +1180,7 @@ void CaptureWidget::handleToolSignal(CaptureTool::Request r)
break;
}
if (m_toolWidget) {
m_toolWidget->close();
m_toolWidget->hide();
delete m_toolWidget;
m_toolWidget = nullptr;
}