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

Destroy desktop integration at correct place

Browse source 
Otherwise it is destructed in QObject destructor, i.e. after GUI application is already destructed.
This can be related to some problems with system tray icon.

PR #18108.
Closes #18093.
This commit is contained in:
Vladimir Golovnev 2022-11-30 20:09:51 +03:00 • committed by Vladimir Golovnev (Glassez)
commit 701b84dc48
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/app/application.cpp
View file

@ -706,7 +706,7 @@ try
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
UIThemeManager::initInstance(); UIThemeManager::initInstance();
m_desktopIntegration = new DesktopIntegration(this); m_desktopIntegration = new DesktopIntegration;
m_desktopIntegration->setToolTip(tr("Loading torrents...")); m_desktopIntegration->setToolTip(tr("Loading torrents..."));
#ifndef Q_OS_MACOS #ifndef Q_OS_MACOS
auto *desktopIntegrationMenu = new QMenu; auto *desktopIntegrationMenu = new QMenu;
@ -1201,6 +1201,7 @@ void Application::cleanup()
::ShutdownBlockReasonDestroy(reinterpret_cast<HWND>(m_window->effectiveWinId())); ::ShutdownBlockReasonDestroy(reinterpret_cast<HWND>(m_window->effectiveWinId()));
#endif // Q_OS_WIN #endif // Q_OS_WIN
delete m_window; delete m_window;
delete m_desktopIntegration;
UIThemeManager::freeInstance(); UIThemeManager::freeInstance();
} }
#endif // DISABLE_GUI #endif // DISABLE_GUI