Browse Source

Fix exception when creating intervals before ShowBase is started

rdb 9 years ago
parent
commit
f363088cb2
3 changed files with 5 additions and 5 deletions
  1. 0 4
      direct/src/showbase/ShowBase.py
  2. 4 1
      direct/src/task/Task.py
  3. 1 0
      doc/ReleaseNotes

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

@@ -131,10 +131,6 @@ class ShowBase(DirectObject.DirectObject):
         ## just before Python is about to shut down.
         ## just before Python is about to shut down.
         self.finalExitCallbacks = []
         self.finalExitCallbacks = []
 
 
-        Task.TaskManager.taskTimerVerbose = self.config.GetBool('task-timer-verbose', 0)
-        Task.TaskManager.extendedExceptions = self.config.GetBool('extended-exceptions', 0)
-        Task.TaskManager.pStatsTasks = self.config.GetBool('pstats-tasks', 0)
-
         # Set up the TaskManager to reset the PStats clock back
         # Set up the TaskManager to reset the PStats clock back
         # whenever we resume from a pause.  This callback function is
         # whenever we resume from a pause.  This callback function is
         # a little hacky, but we can't call it directly from within
         # a little hacky, but we can't call it directly from within

+ 4 - 1
direct/src/task/Task.py

@@ -102,7 +102,10 @@ Task.DtoolClassDict['loop'] = staticmethod(loop)
 class TaskManager:
 class TaskManager:
     notify = directNotify.newCategory("TaskManager")
     notify = directNotify.newCategory("TaskManager")
 
 
-    extendedExceptions = False
+    taskTimerVerbose = ConfigVariableBool('task-timer-verbose', False)
+    extendedExceptions = ConfigVariableBool('extended-exceptions', False)
+    pStatsTasks = ConfigVariableBool('pstats-tasks', False)
+
     MaxEpochSpeed = 1.0/30.0
     MaxEpochSpeed = 1.0/30.0
 
 
     def __init__(self):
     def __init__(self):

+ 1 - 0
doc/ReleaseNotes

@@ -40,6 +40,7 @@ This issue fixes several bugs that were still found in 1.9.2.
 * Fix inoperative -tbn/-tbnall/-tbnauto options in egg-optchar
 * Fix inoperative -tbn/-tbnall/-tbnauto options in egg-optchar
 * Fix tinydisplay texture errors on shutdown
 * Fix tinydisplay texture errors on shutdown
 * Fix mipmap filtering issues in tinydisplay renderer
 * Fix mipmap filtering issues in tinydisplay renderer
+* Fix exception when creating intervals before ShowBase is started
 
 
 ------------------------  RELEASE 1.9.2  ------------------------
 ------------------------  RELEASE 1.9.2  ------------------------