From 03e766a9ab8d665f25d3b04edbe66b0ee0c8f17b Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 28 Mar 2005 19:10:25 +0000
Subject: [PATCH] fix crash when show-buffers is enabled

---
 panda/src/display/graphicsOutput.cxx | 46 ++++++++++++----------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/panda/src/display/graphicsOutput.cxx b/panda/src/display/graphicsOutput.cxx
index fb5a4a181e..e52c4d3336 100644
--- a/panda/src/display/graphicsOutput.cxx
+++ b/panda/src/display/graphicsOutput.cxx
@@ -859,39 +859,33 @@ end_frame() {
     _flip_ready = true;
   }
 
+  // In one-shot mode, we request the GraphicsEngine to delete the
+  // window after we have rendered a frame.
   if (_one_shot) {
-    // In one-shot mode, we request the GraphicsEngine to delete the
-    // window after we have rendered a frame.
-    _active = false;
-    _delete_flag = true;
-
-    // We have to be sure to remove all of the display regions
-    // immediately, so that circular reference counts can be cleared
-    // up (each display region keeps a pointer to a CullResult, which
-    // can hold all sorts of pointers).
-    remove_all_display_regions();
-
-
-    // If we were rendering directly to texture, we can't delete the
-    // buffer until the texture is gone too.
-    if (_rtm_mode == RTM_bind_texture) {
-      _hold_texture = _texture;
-    }
-
-    // Also, when show-buffers mode is enabled, we want to keep the
+    // But when show-buffers mode is enabled, we want to keep the
     // window around until the user has a chance to see the texture.
-    // Same story: we'll hold it until the texture is gone.  In this
-    // case we also keep the active flag true, so the window will
-    // repaint when needed.
-    if (show_buffers) {
-      _hold_texture = _texture;
-      _active = true;
+    // So we don't do most of the following in show-buffers mode.
+    if (!show_buffers) {
+      _active = false;
+      _delete_flag = true;
+      
+      // We have to be sure to remove all of the display regions
+      // immediately, so that circular reference counts can be cleared
+      // up (each display region keeps a pointer to a CullResult,
+      // which can hold all sorts of pointers).
+      remove_all_display_regions();
+      
+      // If we were rendering directly to texture, we can't delete the
+      // buffer until the texture is gone too.
+      if (_rtm_mode == RTM_bind_texture) {
+        _hold_texture = _texture;
+      }
     }
 
     // We have to be sure to clear the _texture pointer, though, or
     // we'll end up holding a reference to it forever.
     _texture = NULL;
-
+    
     // And we need to stop trying to copy to the texture.
     _rtm_mode = RTM_none;
   }