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

diff --git a/common/executor.h b/common/executor.h
index 79fa200288d264d7e7fd1c3c4ff1b159eab42148..0de8137cf6b3733d1d163991b4b20b17814f4d15 100644 (file)
--- a/common/executor.h
+++ b/common/executor.h
@@ -101,19 +101,16 @@ public:
        {\r
                try\r
                {\r
-                       internal_begin_invoke([=]\r
-                       {\r
-                               is_running_ = false;\r
-                       }).wait();\r
+                       wait();\r
                }\r
                catch(...)\r
                {\r
                        CASPAR_LOG_CURRENT_EXCEPTION();\r
-\r
-                       clear();\r
-                       is_running_ = false;\r
-                       semaphore_.try_push(0);\r
                }\r
+               \r
+               is_running_ = false;\r
+               semaphore_.try_push(0);\r
+\r
                thread_.join();\r
        }\r
                                                \r
@@ -197,7 +194,7 @@ public:
        }\r
                \r
 private:       \r
-\r
+       \r
        template<typename Func>\r
        auto internal_begin_invoke(Func&& func, task_priority priority = task_priority::normal_priority) -> boost::unique_future<decltype(func())> // noexcept\r
        {                                       \r