From 11aaf2ffce03cc067df10d547b2a298903215efb Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Tue, 13 May 2008 21:13:49 +0000 Subject: [PATCH] delayed pandac import for Toontown launcher --- direct/src/showbase/EventManager.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/direct/src/showbase/EventManager.py b/direct/src/showbase/EventManager.py index 871d9d5ee6..a097057863 100644 --- a/direct/src/showbase/EventManager.py +++ b/direct/src/showbase/EventManager.py @@ -13,12 +13,14 @@ from direct.task.Task import Task # downloaded. #from pandac.PandaModules import * -from pandac.PandaModules import PStatCollector - class EventManager: notify = None + # delayed import, since this is imported by the Toontown Launcher + # before the complete PandaModules have been downloaded. + PStatCollector = None + # for efficiency, only call import once per module EventStorePandaNode = None EventQueue = None @@ -43,6 +45,8 @@ class EventManager: """ if self._wantPstats is None: self._wantPstats = config.GetBool('pstats-eventmanager', 0) + from pandac.PandaModules import PStatCollector + EventManager.PStatCollector = PStatCollector # use different methods for handling events with and without pstats tracking # for efficiency if self._wantPstats: @@ -155,10 +159,10 @@ class EventManager: hyphen = name.find('-') if hyphen >= 0: name = name[0:hyphen] - pstatCollector = PStatCollector('App:Show code:eventManager:' + name) + pstatCollector = EventManager.PStatCollector('App:Show code:eventManager:' + name) pstatCollector.start() if self.eventHandler: - cppPstatCollector = PStatCollector( + cppPstatCollector = EventManager.PStatCollector( 'App:Show code:eventManager:' + name + ':C++') if paramList: