From 33d494d0f431f536eedf5e70d027d5b9f3b60f67 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 15 Aug 2012 10:55:40 +0000
Subject: [PATCH] make AsyncTaskManager::_global_ptr an ordinary pointer to
 prevent static init issues with PandaFramework

---
 panda/src/event/asyncTaskManager.cxx | 3 ++-
 panda/src/event/asyncTaskManager.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/panda/src/event/asyncTaskManager.cxx b/panda/src/event/asyncTaskManager.cxx
index 0bbfaa93e2..155efc8755 100644
--- a/panda/src/event/asyncTaskManager.cxx
+++ b/panda/src/event/asyncTaskManager.cxx
@@ -23,7 +23,7 @@
 #include "config_event.h"
 #include <algorithm>
 
-PT(AsyncTaskManager) AsyncTaskManager::_global_ptr;
+AsyncTaskManager *AsyncTaskManager::_global_ptr = NULL;
 
 TypeHandle AsyncTaskManager::_type_handle;
 
@@ -731,4 +731,5 @@ make_global_ptr() {
   nassertv(_global_ptr == (AsyncTaskManager *)NULL);
 
   _global_ptr = new AsyncTaskManager("TaskManager");
+  _global_ptr->ref();
 }
diff --git a/panda/src/event/asyncTaskManager.h b/panda/src/event/asyncTaskManager.h
index b2890d8c66..78d7a1df04 100644
--- a/panda/src/event/asyncTaskManager.h
+++ b/panda/src/event/asyncTaskManager.h
@@ -133,7 +133,7 @@ protected:
   
   ConditionVarFull _frame_cvar;  // Signalled when the clock ticks.
 
-  static PT(AsyncTaskManager) _global_ptr;
+  static AsyncTaskManager* _global_ptr;
 
 public:
   static TypeHandle get_class_type() {