From 9f2e1596fd602c359bb91dcfdc347b6895715df7 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 29 Jun 2007 21:46:14 +0000
Subject: [PATCH] fix deadlock at exit

---
 direct/src/showbase/Loader.py   | 3 +++
 direct/src/showbase/ShowBase.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/direct/src/showbase/Loader.py b/direct/src/showbase/Loader.py
index 9e7807c776..fe167cd68e 100644
--- a/direct/src/showbase/Loader.py
+++ b/direct/src/showbase/Loader.py
@@ -51,6 +51,9 @@ class Loader(DirectObject):
 
     def destroy(self):
         self.ignore(self.hook)
+        # Temp condition for old Panda.
+        if hasattr(loader, "stopThreads"):
+            self.loader.stopThreads()
         del self.base
         del self.loader
 
diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index be865a9cbe..cd69f24400 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -388,6 +388,7 @@ class ShowBase(DirectObject.DirectObject):
         is closed cleanly, so that we free system resources, restore
         the desktop and keyboard functionality, etc.
         """
+        self.loader.destroy()
         self.graphicsEngine.removeAllWindows()
 
         if self.musicManager: