Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:58:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6813 from ZappoMan/fixCrashRedux

Browse source 
temporary fix to crash on startup
This commit is contained in:
Brad Davis 2016-01-12 14:28:38 -05:00
commit 24611d33c8
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -448,8 +448,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
_bookmarks = new Bookmarks(); // Before setting up the menu _bookmarks = new Bookmarks(); // Before setting up the menu
_runningScriptsWidget = new RunningScriptsWidget(_window);
// start the nodeThread so its event loop is running // start the nodeThread so its event loop is running
QThread* nodeThread = new QThread(this); QThread* nodeThread = new QThread(this);
nodeThread->setObjectName("NodeList Thread"); nodeThread->setObjectName("NodeList Thread");
@ -980,6 +978,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
connect(this, &Application::applicationStateChanged, this, &Application::activeChanged); 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); qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0);
} }