From: Ronag <Ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Wed, 24 Aug 2011 21:19:52 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~64
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=4ba6006396aff3ce007b15c6ebcc43b194cd8a8d

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1279 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/common/concurrency/executor.h b/common/concurrency/executor.h
index 0687889a1..ad86d4a37 100644
--- a/common/concurrency/executor.h
+++ b/common/concurrency/executor.h
@@ -117,7 +117,6 @@ public:
 	virtual ~executor() // noexcept
 	{
 		stop();
-		execution_queue_[normal_priority].try_push([]{}); // Wake the execution thread.
 		join();
 	}
 
@@ -144,6 +143,7 @@ public:
 	void stop() // noexcept
 	{
 		is_running_ = false;	
+		execution_queue_[normal_priority].try_push([]{}); // Wake the execution thread.
 	}
 
 	void wait() // noexcept