Merge branch 'master' of https://github.com/ronag/Server

[casparcg] / core / producer / frame_producer.cpp

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 3709fbe09c6f2f4cf1b781f361239e7225c77677..066f7fce618b4764c2b4e39fb6d034adde925be1 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -288,7 +288,7 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my
                auto params_copy = params;\r
                if(params_copy.size() > 0)\r
                {\r
-                       auto resource_name = params_copy[0];\r
+                       auto resource_name = params_copy.at_original(0);\r
                        params_copy.set(0, resource_name + L"_A");\r
                        key_producer = do_create_producer(my_frame_factory, params_copy, g_factories);                  \r
                        if(key_producer == frame_producer::empty())\r
@@ -326,11 +326,12 @@ safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<frame_fa
                auto params_copy = params;\r
                if (params_copy.size() > 0)\r
                {\r
-                       params_copy[0] += L"_A";\r
+                       auto resource_name = params_copy.at_original(0);\r
+                       params_copy.set(0, resource_name + L"_A");\r
                        key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);\r
                        if (key_producer == frame_producer::empty())\r
                        {\r
-                               params_copy[0] += L"LPHA";\r
+                               params_copy.set(0, resource_name + L"_ALPHA");\r
                                key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);\r
                        }\r
                }\r