From 41efe18bbac8b461b87dcaf328d371777249e4d9 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sun, 4 Oct 2015 16:12:03 +0200
Subject: [PATCH] Probably fix crash on exit reported in #8022

---
 ext/native/thread/prioritizedworkqueue.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/native/thread/prioritizedworkqueue.cpp b/ext/native/thread/prioritizedworkqueue.cpp
index b10cbe0c4c..9559ead072 100644
--- a/ext/native/thread/prioritizedworkqueue.cpp
+++ b/ext/native/thread/prioritizedworkqueue.cpp
@@ -107,7 +107,9 @@ void ProcessWorkQueueOnThreadWhile(PrioritizedWorkQueue *wq) {
 
 void StopProcessingWorkQueue(PrioritizedWorkQueue *wq) {
 	wq->Stop();
-	workThread->join();
-	delete workThread;
+	if (workThread) {
+		workThread->join();
+		delete workThread;
+	}
 	workThread = 0;
 }