From cbecb2d3ea0eb29e99a7cc85b3149fa6a807d8ab Mon Sep 17 00:00:00 2001
From: Joe Shochet <shochet@gmail.com>
Date: Sat, 13 Dec 2003 00:56:28 +0000
Subject: [PATCH] fixed title task bug

---
 direct/src/level/DistributedLevel.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/direct/src/level/DistributedLevel.py b/direct/src/level/DistributedLevel.py
index 9715d581de..2714afec68 100755
--- a/direct/src/level/DistributedLevel.py
+++ b/direct/src/level/DistributedLevel.py
@@ -299,10 +299,10 @@ class DistributedLevel(DistributedObject.DistributedObject,
 
         self.shutdownVisibility()
         self.destroyLevel()
-        DistributedObject.DistributedObject.disable(self)
         self.ignoreAll()
 
         # NOTE:  this should be moved to FactoryInterior
+        taskMgr.remove(self.uniqueName("titleText"))
         if self.smallTitleText:
             self.smallTitleText.cleanup()
             self.smallTitleText = None
@@ -311,6 +311,8 @@ class DistributedLevel(DistributedObject.DistributedObject,
             self.titleText = None
         self.zonesEnteredList = []
 
+        DistributedObject.DistributedObject.disable(self)
+
     def delete(self):
         DistributedLevel.notify.debug('delete')
         DistributedObject.DistributedObject.delete(self)
@@ -662,7 +664,7 @@ class DistributedLevel(DistributedObject.DistributedObject,
 
         description = getDescription(self.lastCamZone)
         if description and description != '':
-            taskMgr.remove("titleText")
+            taskMgr.remove(self.uniqueName("titleText"))
             self.smallTitleText.setText(description)
             self.titleText.setText(description)
             self.titleText.setColor(Vec4(*self.titleColor))
@@ -690,13 +692,12 @@ class DistributedLevel(DistributedObject.DistributedObject,
                                              0.5),
                     )
             smallTitleSeq = Task.sequence(Task.Task(self.hideTitleTextTask),
-                                          Task.Task(self.showSmallTitleTask),
                                           Task.Task(self.showSmallTitleTask))
             if titleSeq:
                 seq = Task.sequence(titleSeq, smallTitleSeq)
             else:
                 seq = smallTitleSeq
-            taskMgr.add(seq, "titleText")
+            taskMgr.add(seq, self.uniqueName("titleText"))
         
     def showTitleTextTask(self, task):
         assert(DistributedLevel.notify.debug("hideTitleTextTask()"))
@@ -711,14 +712,16 @@ class DistributedLevel(DistributedObject.DistributedObject,
 
     def showSmallTitleTask(self, task):
         # make sure large title is hidden
-        self.titleText.hide()
+        if self.titleText:
+            self.titleText.hide()
         # show the small title
         self.smallTitleText.show()
         return Task.done
     
     def hideSmallTitleTextTask(self, task):
         assert(DistributedLevel.notify.debug("hideTitleTextTask()"))
-        self.smallTitleText.hide()
+        if self.smallTitleText:
+            self.smallTitleText.hide()
         return Task.done
 
     # Ouch!