TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

make AsyncTaskManager::_global_ptr an ordinary pointer to prevent static init issues with PandaFramework

Browse Source
This commit is contained in:
rdb 2012-08-15 10:55:40 +00:00
parent b686b94385
commit 33d494d0f4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/event/asyncTaskManager.cxx
View File

@ -23,7 +23,7 @@
#include "config_event.h" #include "config_event.h"
#include <algorithm> #include <algorithm>
PT(AsyncTaskManager) AsyncTaskManager::_global_ptr; AsyncTaskManager *AsyncTaskManager::_global_ptr = NULL;
TypeHandle AsyncTaskManager::_type_handle; TypeHandle AsyncTaskManager::_type_handle;
@ -731,4 +731,5 @@ make_global_ptr() {
nassertv(_global_ptr == (AsyncTaskManager *)NULL); nassertv(_global_ptr == (AsyncTaskManager *)NULL);
_global_ptr = new AsyncTaskManager("TaskManager"); _global_ptr = new AsyncTaskManager("TaskManager");
_global_ptr->ref();
} }

2
panda/src/event/asyncTaskManager.h
View File

@ -133,7 +133,7 @@ protected:
ConditionVarFull _frame_cvar; // Signalled when the clock ticks. ConditionVarFull _frame_cvar; // Signalled when the clock ticks.
static PT(AsyncTaskManager) _global_ptr; static AsyncTaskManager* _global_ptr;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {