[linux] Don't overwrite thread name if it is already set.

[casparcg] / shell / server.cpp

diff --git a/shell/server.cpp b/shell/server.cpp
index 409ddf3edd2d8106faec2a2250787faa5962b219..2c2c5f3d36be07e467ff86a8f2b877acddcd7177 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -42,6 +42,7 @@
 #include <core/producer/scene/scene_producer.h>
 #include <core/producer/scene/xml_scene_producer.h>
 #include <core/producer/text/text_producer.h>
+#include <core/producer/color/color_producer.h>
 #include <core/consumer/output.h>
 #include <core/mixer/mixer.h>
 #include <core/mixer/image/image_mixer.h>
@@ -167,6 +168,7 @@ struct server::impl : boost::noncopyable
                initialize_modules(dependencies);
                core::text::init(dependencies);
                core::scene::init(dependencies);
+               help_repo_->register_item({ L"producer" }, L"Color Producer", &core::describe_color_producer);
        }
 
        void start()
@@ -322,7 +324,7 @@ struct server::impl : boost::noncopyable
                {
                        for (auto& predefined_client : pt | witerate_children(L"configuration.osc.predefined-clients") | welement_context_iteration)
                        {
-                               ptree_verify_element_name(predefined_client, L"predefined_client");
+                               ptree_verify_element_name(predefined_client, L"predefined-client");
 
                                const auto address =
                                                ptree_get<std::wstring>(predefined_client.second, L"address");