diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index e5a9e18bce..e06583423f 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -131,10 +131,6 @@ class ShowBase(DirectObject.DirectObject): ## just before Python is about to shut down. 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 # whenever we resume from a pause. This callback function is # a little hacky, but we can't call it directly from within diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py index 6d8f38acbd..ba3f50f0b0 100644 --- a/direct/src/task/Task.py +++ b/direct/src/task/Task.py @@ -102,7 +102,10 @@ Task.DtoolClassDict['loop'] = staticmethod(loop) class 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 def __init__(self): diff --git a/doc/ReleaseNotes b/doc/ReleaseNotes index 0728f34023..cdaba3cc7a 100644 --- a/doc/ReleaseNotes +++ b/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 tinydisplay texture errors on shutdown * Fix mipmap filtering issues in tinydisplay renderer +* Fix exception when creating intervals before ShowBase is started ------------------------ RELEASE 1.9.2 ------------------------