Added closing of the _eventDisplay on failure of initializing the context properly.

2011-05-30 09:26:24 +00:00
parent 4d09574ccd
commit 0201480582
1 changed files with 11 additions and 2 deletions
--- a/src/osgViewer/GraphicsWindowX11.cpp
+++ b/src/osgViewer/GraphicsWindowX11.cpp
@@ -809,8 +809,17 @@ void GraphicsWindowX11::init()

    if (_valid == false)
    {
-        XCloseDisplay( _display );
-        _display = 0;
+        if (_display)
+        {
+            XCloseDisplay( _display );
+            _display = 0;
+        }
+
+        if (_eventDisplay)
+        {
+            XCloseDisplay( _eventDisplay );
+            _eventDisplay = 0;
+        }
    }