From 02014805822695799fb64957bbaaf77535d2d7aa Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 30 May 2011 09:26:24 +0000 Subject: [PATCH] Added closing of the _eventDisplay on failure of initializing the context properly. --- src/osgViewer/GraphicsWindowX11.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp index f93c2caa0..c95b2f399 100644 --- 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; + } }