mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-23 00:47:21 -06:00
Merge pull request #18119 from glassez/destruct-tray
Destroy desktop integration at correct place
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user