]> git.sesse.net Git - casparcg/commitdiff
#541 Fixed regression in html producer
authorHelge Norberg <helge.norberg@svt.se>
Wed, 25 Jan 2017 16:39:47 +0000 (17:39 +0100)
committerHelge Norberg <helge.norberg@svt.se>
Wed, 25 Jan 2017 16:39:47 +0000 (17:39 +0100)
modules/html/producer/html_producer.cpp

index 256b7b21701bd3659430d7b74a9b8b6612d15897..241c2f41f158a613a2ac30de96072414338770d4 100644 (file)
@@ -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<core::frame_producer> 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<html_producer>(