Merge pull request #18119 from glassez/destruct-tray

Destroy desktop integration at correct place
This commit is contained in:
sledgehammer999 2022-11-30 21:29:00 +02:00 committed by GitHub
commit 18577d9cb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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