fly/flightgear
1
0
Fork 0
Code Activity

Fix an assert running aero tests

Browse source 
FGLocale needs to be init-ed, before calling splash progress.
This commit is contained in:
James Turner 2020-07-22 11:49:14 +01:00
parent 3255105190
commit 1e403ae6dd
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test_suite/FGTestApi/scene_graph.cxx
View file

@ -21,6 +21,7 @@
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Main/locale.hxx>
#include <Scenery/scenery.hxx> #include <Scenery/scenery.hxx>
#include <Viewer/renderer.hxx> #include <Viewer/renderer.hxx>
#include <Viewer/FGEventHandler.hxx> #include <Viewer/FGEventHandler.hxx>
@ -37,6 +38,9 @@ void initScenery()
SG_LOG(SG_GENERAL, SG_ALERT, "Cannot read the global defaults from \"" << defaultsXML.utf8Str() << "\"."); SG_LOG(SG_GENERAL, SG_ALERT, "Cannot read the global defaults from \"" << defaultsXML.utf8Str() << "\".");
fgLoadProps("defaults.xml", globals->get_props()); fgLoadProps("defaults.xml", globals->get_props());
// otherwise fgSplashProgress will assert
globals->get_locale()->selectLanguage({});
// Set up the renderer. // Set up the renderer.
osg::ref_ptr<osgViewer::Viewer> viewer = new osgViewer::Viewer; osg::ref_ptr<osgViewer::Viewer> viewer = new osgViewer::Viewer;
FGRenderer* render = globals->get_renderer(); FGRenderer* render = globals->get_renderer();