From 1a68dd80d72e82221cb6341aaf3d0062dc702185 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 20 Aug 2003 12:52:33 +0000
Subject: [PATCH] Added explicit calls cancel and wait until thread and no
 longer running to the DatabasePager and TXP pager.

---
 include/osgDB/DatabasePager              |  2 +-
 src/osg/GLExtensions.cpp                 |  2 --
 src/osgDB/DatabasePager.cpp              | 20 ++++++++++++++++++++
 src/osgPlugins/txp/trPagePageManager.cpp | 11 ++++++++++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/include/osgDB/DatabasePager b/include/osgDB/DatabasePager
index fd0b2db05..9bd92b5da 100644
--- a/include/osgDB/DatabasePager
+++ b/include/osgDB/DatabasePager
@@ -115,7 +115,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
 
     protected :
 
-        virtual ~DatabasePager() {}
+        virtual ~DatabasePager();
         
         struct DatabaseRequest : public osg::Referenced
         {
diff --git a/src/osg/GLExtensions.cpp b/src/osg/GLExtensions.cpp
index c3c66425e..f6e221a48 100644
--- a/src/osg/GLExtensions.cpp
+++ b/src/osg/GLExtensions.cpp
@@ -97,8 +97,6 @@ bool osg::isGLExtensionSupported(const char *extension)
 
                 }
                             
-                std::cout<<"render='"<<renderer<<"'"<<std::endl;
-
                 if (renderer.empty())
                 {
                     extensionDisabled = true;
diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp
index d90fe62b8..05fc8c88a 100644
--- a/src/osgDB/DatabasePager.cpp
+++ b/src/osgDB/DatabasePager.cpp
@@ -21,6 +21,26 @@ DatabasePager::DatabasePager()
     _expiryDelay = 1.0;
 }
 
+DatabasePager::~DatabasePager()
+{
+    if( isRunning() )
+    {
+        // cancel the thread..
+        cancel();
+        //join();
+
+        // then wait for the the thread to stop running.
+        while(isRunning())
+        {
+            std::cout<<"Waiting for RenderSurface to cancel"<<std::endl;
+            //OpenThreads::Thread::YieldCurrentThread();
+            OpenThreads::Thread::Yield();
+        }
+        
+    }
+        
+}
+
 void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* group)
 {
    
diff --git a/src/osgPlugins/txp/trPagePageManager.cpp b/src/osgPlugins/txp/trPagePageManager.cpp
index 5f1568616..e8ec36f85 100644
--- a/src/osgPlugins/txp/trPagePageManager.cpp
+++ b/src/osgPlugins/txp/trPagePageManager.cpp
@@ -152,7 +152,16 @@ bool OSGPageManager::EndThread()
     if( pagingThread.isRunning() )
     {
         pagingThread.cancel();
-        pagingThread.join();
+        //pagingThread.join();
+        
+        // then wait for the the thread to stop running.
+        while(pagingThread.isRunning())
+        {
+            std::cout<<"Waiting for TXP pager thread to cancel"<<std::endl;
+            //OpenThreads::Thread::YieldCurrentThread();
+            OpenThreads::Thread::Yield();
+        }
+       
     }
     return true;
 }