From: Helge Norberg Date: Wed, 25 Jan 2017 16:39:47 +0000 (+0100) Subject: #541 Fixed regression in html producer X-Git-Tag: 2.1.0_Beta2~116 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=cef75b87a9ce0b4419d8bcbf810a36b755894fd0;p=casparcg #541 Fixed regression in html producer --- diff --git a/modules/html/producer/html_producer.cpp b/modules/html/producer/html_producer.cpp index 256b7b217..241c2f41f 100644 --- a/modules/html/producer/html_producer.cpp +++ b/modules/html/producer/html_producer.cpp @@ -73,7 +73,7 @@ #pragma comment (lib, "libcef_dll_wrapper.lib") namespace caspar { namespace html { - + class html_client : public CefClient , public CefRenderHandler @@ -459,7 +459,7 @@ public: window_info.SetTransparentPainting(true); window_info.SetAsOffScreen(nullptr); //window_info.SetAsWindowless(nullptr, true); - + CefBrowserSettings browser_settings; browser_settings.web_security = cef_state_t::STATE_DISABLED; CefBrowserHost::CreateBrowser(window_info, client_.get(), url, browser_settings, nullptr); @@ -606,11 +606,11 @@ spl::shared_ptr create_producer( if (!found_filename && !html_prefix) return core::frame_producer::empty(); - const auto url = found_filename + const auto url = found_filename ? L"file://" + *found_filename : params.at(1); - - if (!html_prefix || boost::algorithm::ends_with(url, "_A") || boost::algorithm::ends_with(url, "_ALPHA")) + + if (!html_prefix && (!boost::algorithm::contains(url, ".") || boost::algorithm::ends_with(url, "_A") || boost::algorithm::ends_with(url, "_ALPHA"))) return core::frame_producer::empty(); return core::create_destroy_proxy(spl::make_shared(