fly/flightgear
1
0
Fork 0
Code Activity

Fix crash when display/screen number invalid

Browse source 
getScreenResolution shouldn't be called before the safety check.
Fixes commit ba7d8b8155
This commit is contained in:
ThorstenB 2011-06-04 17:55:12 +02:00
parent c9bb9f6044
commit a2c768c7cd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Main/WindowBuilder.cxx
View file

@ -53,12 +53,8 @@ WindowBuilder::makeDefaultTraits(bool stencil)
GraphicsContext::WindowingSystemInterface* wsi
= osg::GraphicsContext::getWindowingSystemInterface();
GraphicsContext::Traits* traits = new osg::GraphicsContext::Traits;
traits->readDISPLAY();
unsigned screenwidth = 0;
unsigned screenheight = 0;
wsi->getScreenResolution(*traits, screenwidth, screenheight);
if (traits->displayNum < 0)
traits->displayNum = 0;
if (traits->screenNum < 0)
@ -76,6 +72,10 @@ WindowBuilder::makeDefaultTraits(bool stencil)
if (stencil)
traits->stencil = 8;
unsigned screenwidth = 0;
unsigned screenheight = 0;
wsi->getScreenResolution(*traits, screenwidth, screenheight);
traits->doubleBuffer = true;
traits->mipMapGeneration = true;
traits->windowName = "FlightGear";