From 0b3d56f9f9375879c3a90e3ceeb4b20a99f05a6d Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 19 Dec 2017 17:32:12 +0000
Subject: [PATCH] Ensure python global shutdown after context has closed

---
 qrenderdoc/Code/pyrenderdoc/PythonContext.cpp | 3 +++
 qrenderdoc/Code/qrenderdoc.cpp                | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
index ee78479b8..a6ab84609 100644
--- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
@@ -467,6 +467,9 @@ void PythonContext::Finish()
 
 void PythonContext::GlobalShutdown()
 {
+  if(!initialised())
+    return;
+
   // must happen on the UI thread
   if(qApp->thread() != QThread::currentThread())
   {
diff --git a/qrenderdoc/Code/qrenderdoc.cpp b/qrenderdoc/Code/qrenderdoc.cpp
index 2019c904a..49b184e45 100644
--- a/qrenderdoc/Code/qrenderdoc.cpp
+++ b/qrenderdoc/Code/qrenderdoc.cpp
@@ -365,10 +365,10 @@ int main(int argc, char *argv[])
       }
 
       config.Save();
-
-      PythonContext::GlobalShutdown();
     }
 
+    PythonContext::GlobalShutdown();
+
     Formatter::shutdown();
   }