Fixed deadlock on start with recent Qt versions

ksuprynowicz committed 3 years ago

Commit 28079eb1 parent 8b9cd842 files · +18 −1Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

 #endif
 }
+bool Application::initMenu() {
+    _isMenuInitialized = false;
+    qApp->getWindow()->menuBar();
+    return true;
+}
 Application::Application(
     int& argc, char** argv,
     const QCommandLineParser& parser,
 ) :
     QApplication(argc, argv),
     _window(new MainWindow(desktop())),
+    // Menu needs to be initialized before other initializers. Otherwise deadlock happens on qApp->getWindow()->menuBar().
+    _isMenuInitialized(initMenu()),
     _sessionRunTimer(startupTimer),
 #ifndef Q_OS_ANDROID
     _logger(new FileLogger(this)),
     _snapshotSound(nullptr),
     _sampleSound(nullptr)
 {
     auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
     setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
     setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
         return false;
     }
+    // This helps avoid deadlock issue early during Application initialization
+    if (!_isMenuInitialized) {
+        return QApplication::event(event);
+    }
     if (!Menu::getInstance()) {
         return false;
     }