From 96d5b27bb75d871eaa772f60a17f8891ef2f8bf7 Mon Sep 17 00:00:00 2001
From: Justin Butler <jlbutler@users.sourceforge.net>
Date: Thu, 28 Jun 2007 02:35:08 +0000
Subject: [PATCH] Fixed task name generation for SubframeCall for my prevously
 added cleanup code.

---
 direct/src/showbase/PythonUtil.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py
index 42ac1cbf75..7ba6f10543 100644
--- a/direct/src/showbase/PythonUtil.py
+++ b/direct/src/showbase/PythonUtil.py
@@ -2498,18 +2498,21 @@ class SubframeCall:
     def __init__(self, functor, taskPriority, name=None):
         self._functor = functor
         self._name = name
+        self._taskName = uniqueName('SubframeCall-%s' % self._name)
         taskMgr.add(self._doCallback,
-                    uniqueName('SubframeCall-%s' % self._name),
+                    self._taskName,
                     priority=taskPriority)
     def _doCallback(self, task):
         functor = self._functor
         del self._functor
         functor()
-        self._name = None
+        del self._name
+        self._taskName = None
         return task.done
     def cleanup(self):
-        if (self._name):
-            taskMgr.remove(uniqueName('SubframeCall-%s' % self._name))
+        if (self._taskName):
+            taskMgr.remove(self._taskName)
+            self._taskName = None
 
 class ArgumentEater:
     def __init__(self, numToEat, func):