1
0
Fork 0

Revert "Initialise Qt earlier, and whenever available"

Temporary workaround for
http://sourceforge.net/p/flightgear/codetickets/1819/

This reverts commit 3e67417bf0.
This commit is contained in:
Rebecca N. Palmer 2015-11-30 23:10:32 +00:00
parent 6954360dfa
commit d56fbfd415
2 changed files with 1 additions and 6 deletions

View file

@ -67,9 +67,6 @@
#include "fg_os.hxx"
#ifdef HAVE_QT
#include <GUI/QtLauncher.hxx>
#endif
#if defined(HAVE_CRASHRPT)
#include <CrashRpt.h>
@ -230,9 +227,6 @@ int main ( int argc, char **argv )
// when fg_terminate runs, which causes crashes.
osg::Texture::getTextureObjectManager(0);
osg::GLBufferObjectManager::getGLBufferObjectManager(0);
#endif
#ifdef HAVE_QT
flightgear::initApp(argc, argv);
#endif
std::set_terminate(fg_terminate);
atexit(fgExitCleanup);

View file

@ -449,6 +449,7 @@ int fgMainInit( int argc, char **argv )
showLauncher |= (::getenv("FG_LAUNCHER") != 0);
if (showLauncher) {
flightgear::initApp(argc, argv);
if (!flightgear::runLauncherDialog()) {
return EXIT_SUCCESS;
}