Revert "Another way to fix Launchapp unexpectly close (#2675)" (#2691)

This reverts commit adb58e247b.
This commit is contained in:
borgmanJeremy
2022-06-20 09:13:45 -05:00
committed by GitHub
parent adb58e247b
commit 37c4ab4f2a
3 changed files with 6 additions and 11 deletions

View File

@@ -37,7 +37,6 @@
Flameshot::Flameshot()
: m_captureWindow(nullptr)
, m_have_external_widgets(false)
#if defined(Q_OS_MACOS)
, m_HotkeyScreenshotCapture(nullptr)
, m_HotkeyScreenshotHistory(nullptr)
@@ -412,13 +411,12 @@ void Flameshot::exportCapture(QPixmap capture,
if (!(tasks & CR::UPLOAD)) {
emit captureTaken(capture);
}
if (!m_have_external_widgets)
qApp->quit();
}
void Flameshot::setExternalWidgets()
{
m_have_external_widgets = true;
// hacks: close a window to trigger qt's quitOnLastWindowClose
// if not create tmp_window and close, the `flameshot gui` won't exit after
// click copy button
QWidget* tmp = new QWidget();
tmp->show();
tmp->close();
}
// STATIC ATTRIBUTES

View File

@@ -47,7 +47,6 @@ public slots:
public:
static void setOrigin(Origin origin);
static Origin origin();
void setExternalWidgets();
signals:
void captureTaken(QPixmap p);
@@ -60,7 +59,6 @@ public slots:
private:
Flameshot();
bool resolveAnyConfigErrors();
bool m_have_external_widgets;
// class members
static Origin m_origin;

View File

@@ -1200,7 +1200,6 @@ void CaptureWidget::handleToolSignal(CaptureTool::Request r)
w->setAttribute(Qt::WA_DeleteOnClose);
w->activateWindow();
w->show();
Flameshot::instance()->setExternalWidgets();
}
break;
case CaptureTool::REQ_INCREASE_TOOL_SIZE: