d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Prevent tray menu from being accessed after destruction

Browse Source 
PR #17400.
This commit is contained in:
Vladimir Golovnev 2022-07-21 09:30:05 +03:00 committed by GitHub
parent 71e53a4628
commit 5b269a782a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/application.cpp
View File

@ -50,6 +50,7 @@
#include <QProcess> #include <QProcess>
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
#include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QPixmapCache> #include <QPixmapCache>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
@ -973,6 +974,14 @@ void Application::cleanup()
LogMsg(tr("qBittorrent termination initiated")); LogMsg(tr("qBittorrent termination initiated"));
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
if (m_desktopIntegration)
{
m_desktopIntegration->disconnect();
m_desktopIntegration->setToolTip(tr("qBittorrent is shutting down..."));
if (m_desktopIntegration->menu())
m_desktopIntegration->menu()->setEnabled(false);
}
if (m_window) if (m_window)
{ {
// Hide the window and don't leave it on screen as // Hide the window and don't leave it on screen as

6
src/gui/mainwindow.cpp
View File

@ -481,6 +481,7 @@ MainWindow::MainWindow(IGUIApplication *app, QWidget *parent)
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
app()->desktopIntegration()->setMenu(nullptr);
delete m_ui; delete m_ui;
} }
@ -1171,11 +1172,6 @@ void MainWindow::closeEvent(QCloseEvent *e)
} }
} }
// Disable some UI to prevent user interactions
app()->desktopIntegration()->disconnect();
app()->desktopIntegration()->setToolTip(tr("qBittorrent is shutting down..."));
app()->desktopIntegration()->menu()->setEnabled(false);
// Accept exit // Accept exit
e->accept(); e->accept();
qApp->exit(); qApp->exit();