From f433f4d97385ab1ca2a9dd57cef24e0f483bfd22 Mon Sep 17 00:00:00 2001 From: Mathias Froehlich Date: Mon, 14 Jun 2010 22:05:15 +0200 Subject: [PATCH] Default the screen and display number to a value >= 0 --- src/Main/WindowBuilder.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Main/WindowBuilder.cxx b/src/Main/WindowBuilder.cxx index 79fff968f..d1c90618f 100644 --- a/src/Main/WindowBuilder.cxx +++ b/src/Main/WindowBuilder.cxx @@ -60,6 +60,10 @@ WindowBuilder::makeDefaultTraits(bool stencil) GraphicsContext::Traits* traits = new osg::GraphicsContext::Traits; traits->readDISPLAY(); + if (traits->displayNum < 0) + traits->displayNum = 0; + if (traits->screenNum < 0) + traits->screenNum = 0; int cbits = (bpp <= 16) ? 5 : 8; int zbits = (bpp <= 16) ? 16 : 24; traits->red = traits->green = traits->blue = cbits; @@ -148,7 +152,7 @@ GraphicsWindow* WindowBuilder::buildWindow(const SGPropertyNode* winNode) string windowName; if (winNode->hasChild("window-name")) windowName = winNode->getStringValue("window-name"); - else if (winNode->hasChild("name")) + else if (winNode->hasChild("name")) windowName = winNode->getStringValue("name"); GraphicsWindow* result = 0; if (!windowName.empty()) { -- 2.39.5