git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

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