INTEGRATION: CWS vcl30 (1.22.146); FILE MERGED

2004/11/02 13:23:10 pl 1.22.146.1: #i35773# do not unload GL lib before XCloseDisplay

1 files changed, 11 insertions, 3 deletions

diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx
index b0e79026c518..2432719c2360 100644
--- a/vcl/unx/source/app/salinst.cxx
+++ b/vcl/unx/source/app/salinst.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salinst.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: hr $ $Date: 2004-11-09 16:48:26 $
+ *  last change: $Author: obo $ $Date: 2004-11-15 12:28:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,11 +171,12 @@ X11SalInstance::~X11SalInstance()
     // deinitialize global sound resources
     X11SalSound::Release();
 
-    // eventually free OpenGL lib
+    // release (possibly open) OpenGL context
     X11SalOpenGL::Release();
 
     // close session management
     SessionManagerClient::close();
+
     // dispose SalDisplay list from SalData
     // would be done in a static destructor else which is
     // a little late
@@ -185,6 +186,13 @@ X11SalInstance::~X11SalInstance()
     delete pSalData;
     SetSalData( NULL );
 
+    // eventually free OpenGL lib
+    // this needs to be done after XCloseDisplay
+    // since GL may have added extension data - including a
+    // function pointer that gets called on XCloseDisplay - to
+    // the display structure
+    X11SalOpenGL::ReleaseLib();
+
       delete mpSalYieldMutex;
 }