From f37c070c7cbbc1ebf729fdbcc882e190a6d0cd84 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 3 Jan 2018 00:06:37 +0100
Subject: [PATCH] tests: cleanup GraphicsEngine to prevent shutdown freeze on
 windows

This occurs with the multithreaded render pipeline.  It's not an issue when using ShowBase because ShowBase also explicitly calls this during shutdown.
---
 tests/display/conftest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/display/conftest.py b/tests/display/conftest.py
index 474ab5ee0b..c66ef2f54a 100644
--- a/tests/display/conftest.py
+++ b/tests/display/conftest.py
@@ -20,6 +20,9 @@ def graphics_engine():
     engine = GraphicsEngine.get_global_ptr()
     yield engine
 
+    # This causes GraphicsEngine to also terminate the render threads.
+    engine.remove_all_windows()
+
 
 @pytest.fixture
 def window(graphics_pipe, graphics_engine):