David Rose пре 18 година
родитељ
комит
9f2e1596fd
2 измењених фајлова са 4 додато и 0 уклоњено
  1. 3 0
      direct/src/showbase/Loader.py
  2. 1 0
      direct/src/showbase/ShowBase.py

+ 3 - 0
direct/src/showbase/Loader.py

@@ -51,6 +51,9 @@ class Loader(DirectObject):
 
 
     def destroy(self):
     def destroy(self):
         self.ignore(self.hook)
         self.ignore(self.hook)
+        # Temp condition for old Panda.
+        if hasattr(loader, "stopThreads"):
+            self.loader.stopThreads()
         del self.base
         del self.base
         del self.loader
         del self.loader
 
 

+ 1 - 0
direct/src/showbase/ShowBase.py

@@ -388,6 +388,7 @@ class ShowBase(DirectObject.DirectObject):
         is closed cleanly, so that we free system resources, restore
         is closed cleanly, so that we free system resources, restore
         the desktop and keyboard functionality, etc.
         the desktop and keyboard functionality, etc.
         """
         """
+        self.loader.destroy()
         self.graphicsEngine.removeAllWindows()
         self.graphicsEngine.removeAllWindows()
 
 
         if self.musicManager:
         if self.musicManager: