|
|
|
@ -803,7 +803,6 @@ try
@@ -803,7 +803,6 @@ try
|
|
|
|
|
|
|
|
|
|
disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog); |
|
|
|
|
// we must not delete menu while it is used by DesktopIntegration
|
|
|
|
|
auto *oldMenu = m_desktopIntegration->menu(); |
|
|
|
|
#ifndef Q_OS_MACOS |
|
|
|
|
const WindowState windowState = !m_startupProgressDialog ? WindowState::Hidden |
|
|
|
|
: (m_startupProgressDialog->windowState() & Qt::WindowMinimized) ? WindowState::Minimized |
|
|
|
@ -813,7 +812,6 @@ try
@@ -813,7 +812,6 @@ try
|
|
|
|
|
? WindowState::Minimized : WindowState::Normal; |
|
|
|
|
#endif |
|
|
|
|
m_window = new MainWindow(this, windowState); |
|
|
|
|
delete oldMenu; |
|
|
|
|
delete m_startupProgressDialog; |
|
|
|
|
#ifdef Q_OS_WIN |
|
|
|
|
auto *pref = Preferences::instance(); |
|
|
|
|