Fixed problem with image_scroll_producer where CALL SPEED was reversed with regard...

[casparcg] / common / executor.h

diff --git a/common/executor.h b/common/executor.h
index b81bb0187c464f589b3095a71620189b37ceb899..805c1bc9dbe6d080fbd7a418d0cd29dd34fb65a6 100644 (file)
--- a/common/executor.h
+++ b/common/executor.h
@@ -250,7 +250,17 @@ private:
                                function();
                        }
 
-                       return future.get();
+                       try
+                       {
+                               return future.get();
+                       }
+                       catch (const caspar_exception& e)
+                       {
+                               if (!is_current()) // Add context information from this thread before rethrowing.
+                                       e << context_info(get_context() + *boost::get_error_info<context_info_t>(e));
+
+                               throw;
+                       }
                });
        }