github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-12 08:16:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Correctly replace desktop integration menu

Browse source
This commit is contained in:
Vladimir Golovnev (Glassez) 2022-08-06 19:37:51 +03:00
parent 15515200ee
commit d27dd85dfd
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/application.cpp
View file

@ -754,10 +754,12 @@ try
}); });
disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog); disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog);
delete m_desktopIntegration->menu(); // we must not delete menu while it is used by DesktopIntegration
auto *oldMenu = m_desktopIntegration->menu();
const MainWindow::State windowState = (!m_startupProgressDialog || (m_startupProgressDialog->windowState() & Qt::WindowMinimized)) const MainWindow::State windowState = (!m_startupProgressDialog || (m_startupProgressDialog->windowState() & Qt::WindowMinimized))
? MainWindow::Minimized : MainWindow::Normal; ? MainWindow::Minimized : MainWindow::Normal;
m_window = new MainWindow(this, windowState); m_window = new MainWindow(this, windowState);
delete oldMenu;
delete m_startupProgressDialog; delete m_startupProgressDialog;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
auto *pref = Preferences::instance(); auto *pref = Preferences::instance();