From 5ec5ff9ad07f5b98ff798cdaab3f4d3606bb472f Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 12 Jan 2016 09:11:20 -0800 Subject: [PATCH 1/2] temporary fix to crash on startup --- interface/src/Application.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index b62f34630d..f2059d103c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -615,8 +615,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : OffscreenUi::warning(nullptr, "Error Loading Script", filename + " failed to load."); }, Qt::QueuedConnection); - _runningScriptsWidget = new RunningScriptsWidget(_window); - #ifdef _WIN32 WSADATA WsaData; @@ -981,6 +979,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : connect(this, &Application::applicationStateChanged, this, &Application::activeChanged); + // FIXME -- NOTE: This will call ProcessEvents() which can cause authentication signals to fire, which + // if not logged in can cause the login dialog to appear. As currently implemented, the login requires + // the offscreen UI to render, so this needs to be well after OffscreenUi is available + _runningScriptsWidget = new RunningScriptsWidget(_window); + qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0); } From 5b9607ca29baa2dedd6cf636bc314dfb85778ca5 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 12 Jan 2016 10:36:59 -0800 Subject: [PATCH 2/2] fix merge --- interface/src/Application.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2af7f02972..087c6503d0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -448,8 +448,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : _bookmarks = new Bookmarks(); // Before setting up the menu - _runningScriptsWidget = new RunningScriptsWidget(_window); - // start the nodeThread so its event loop is running QThread* nodeThread = new QThread(this); nodeThread->setObjectName("NodeList Thread");