From 9201d75bbe7d6cb91375c320b0e37ff520054442 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 9 Nov 2019 14:39:49 +0100 Subject: [PATCH] gobj: fix crash on shutdown with cached buffer contexts This was a regression from 207263c1a89de2386d140573d5b5c14b53974048 --- panda/src/gobj/preparedGraphicsObjects.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/panda/src/gobj/preparedGraphicsObjects.cxx b/panda/src/gobj/preparedGraphicsObjects.cxx index 800d4ee1f6..5854d37196 100644 --- a/panda/src/gobj/preparedGraphicsObjects.cxx +++ b/panda/src/gobj/preparedGraphicsObjects.cxx @@ -1674,10 +1674,7 @@ cache_unprepared_buffer(BufferContext *buffer, size_t data_size_bytes, (int)buffer_cache_size > released_buffer_cache_size) { BufferContext *released_buffer = buffer_list.back(); buffer_list.pop_back(); - if (released_buffer->_object != nullptr) { - released_buffer->_object = nullptr; - released_buffers.push_back(released_buffer); - } + released_buffers.push_back(released_buffer); buffer_cache_size -= release_key._data_size_bytes; }