fly/flightgear
1
0
Fork 0
Code Activity

Default the screen and display number to a value >= 0

Browse source
This commit is contained in:
Mathias Froehlich 2010-06-14 22:05:15 +02:00
parent b692a165fb
commit f433f4d973
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Main/WindowBuilder.cxx
View file

@ -60,6 +60,10 @@ WindowBuilder::makeDefaultTraits(bool stencil)
GraphicsContext::Traits* traits = new osg::GraphicsContext::Traits; GraphicsContext::Traits* traits = new osg::GraphicsContext::Traits;
traits->readDISPLAY(); traits->readDISPLAY();
if (traits->displayNum < 0)
traits->displayNum = 0;
if (traits->screenNum < 0)
traits->screenNum = 0;
int cbits = (bpp <= 16) ? 5 : 8; int cbits = (bpp <= 16) ? 5 : 8;
int zbits = (bpp <= 16) ? 16 : 24; int zbits = (bpp <= 16) ? 16 : 24;
traits->red = traits->green = traits->blue = cbits; traits->red = traits->green = traits->blue = cbits;
@ -148,7 +152,7 @@ GraphicsWindow* WindowBuilder::buildWindow(const SGPropertyNode* winNode)
string windowName; string windowName;
if (winNode->hasChild("window-name")) if (winNode->hasChild("window-name"))
windowName = winNode->getStringValue("window-name"); windowName = winNode->getStringValue("window-name");
else if (winNode->hasChild("name")) else if (winNode->hasChild("name"))
windowName = winNode->getStringValue("name"); windowName = winNode->getStringValue("name");
GraphicsWindow* result = 0; GraphicsWindow* result = 0;
if (!windowName.empty()) { if (!windowName.empty()) {