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

diff --git a/modules/flash/flash.cpp b/modules/flash/flash.cpp
index 7ed22fb9f0e6fe18389e7170261579ad827a035d..84de48f5145bcb73cec6500e9a0392f63e0aff86 100644 (file)
--- a/modules/flash/flash.cpp
+++ b/modules/flash/flash.cpp
@@ -4,6 +4,7 @@
 \r
 #include "producer/cg_producer.h"\r
 #include "producer/flash_producer.h"\r
+#include "producer/flash_producer.h"\r
 \r
 #include <common/env.h>\r
 \r
@@ -12,6 +13,12 @@ namespace caspar{
 void init_flash()\r
 {\r
        core::register_producer_factory(create_ct_producer);\r
+\r
+       try\r
+       {\r
+               create_flash_producer(boost::assign::list_of(env::template_host()));\r
+       }\r
+       catch(...){}\r
 }\r
 \r
 std::wstring get_cg_version()\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index f7c3d32d27ff7f796824c479e390015d13980318..0a78c79f58c669104dd319065aac65a94e388210 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -220,15 +220,17 @@ public:
                        BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename)));  \r
                 \r
                fps_ = 0;\r
+               executor_.start();\r
        }\r
 \r
        ~flash_producer()\r
        {\r
                executor_.clear();\r
+               CASPAR_ASSERT(executor_.is_running());\r
                executor_.invoke([=]\r
                {\r
                        renderer_ = nullptr;\r
-               });\r
+               });             \r
        }\r
        \r
        virtual void set_frame_factory(const safe_ptr<core::frame_factory>& frame_factory)\r
@@ -239,7 +241,6 @@ public:
                graph_ = diagnostics::create_graph([this]{return print();});\r
                graph_->set_color("output-buffer", diagnostics::color(0.0f, 1.0f, 0.0f));\r
                \r
-               executor_.start();\r
                executor_.begin_invoke([=]\r
                {\r
                        init_renderer();\r