X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Fconcurrency%2Fexecutor.h;h=ad86d4a379358f11083f56df523ba66b7f703e45;hb=4ba6006396aff3ce007b15c6ebcc43b194cd8a8d;hp=0687889a179a951b0d2e14d82a9162941a4d03dd;hpb=a486c25d5e6ce0ebe08e9a2d793a447ff3cb797a;p=casparcg

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