From 6a263746cd0a7fad2e9cc745e54c009737cf6e9b Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sat, 7 Nov 2015 21:55:51 +0100
Subject: [PATCH] Fix Cg crash at shutdown when multithreaded pipeline is
 active

---
 panda/src/display/graphicsStateGuardian.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx
index 9fbe8b9606..5faf282e53 100644
--- a/panda/src/display/graphicsStateGuardian.cxx
+++ b/panda/src/display/graphicsStateGuardian.cxx
@@ -2980,7 +2980,6 @@ close_gsg() {
     display_cat.debug()
       << this << " close_gsg " << get_type() << "\n";
   }
-  free_pointers();
 
   // As tempting as it may be to try to release all the textures and
   // geoms now, we can't, because we might not be the currently-active
@@ -3005,6 +3004,8 @@ close_gsg() {
 #ifdef DO_PSTATS
   _pending_timer_queries.clear();
 #endif
+
+  free_pointers();
 }
 
 ////////////////////////////////////////////////////////////////////