[html_producer] #525 Fixed bug where only URL:s with . in them where recognized.

diff --git a/CHANGELOG b/CHANGELOG
index 6aae7c50fce1c85703856f0b83b354df03e40cfa..7dbc5555f8bf9162db22c6a7dcb8eeab524381fa 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -41,6 +41,8 @@ Producers
       decode the first frame.\r
   o Framerate producer:\r
     + Fixed bug when INFO was used on a not yet playing framerate producer.\r
+  o HTML producer:\r
+    + Fixed bug where only URL:s with . in them where recognized.\r
 \r
 Mixer\r
 -----\r

diff --git a/modules/html/producer/html_producer.cpp b/modules/html/producer/html_producer.cpp
index 78ca18fc7be036b8bfd073925316ea79aa108ef1..256b7b21701bd3659430d7b74a9b8b6612d15897 100644 (file)
--- a/modules/html/producer/html_producer.cpp
+++ b/modules/html/producer/html_producer.cpp
@@ -599,17 +599,18 @@ spl::shared_ptr<core::frame_producer> create_producer(
                const core::frame_producer_dependencies& dependencies,
                const std::vector<std::wstring>& params)
 {
-       const auto filename = env::template_folder() + params.at(0) + L".html";
-       const auto found_filename = find_case_insensitive(filename);
+       const auto filename                     = env::template_folder() + params.at(0) + L".html";
+       const auto found_filename       = find_case_insensitive(filename);
+       const auto html_prefix          = boost::iequals(params.at(0), L"[HTML]");
 
-       if (!found_filename && !boost::iequals(params.at(0), L"[HTML]"))
+       if (!found_filename && !html_prefix)
                return core::frame_producer::empty();
 
        const auto url = found_filename 
                ? L"file://" + *found_filename
                : params.at(1);
                
-       if (!boost::algorithm::contains(url, ".") || boost::algorithm::ends_with(url, "_A") || boost::algorithm::ends_with(url, "_ALPHA"))
+       if (!html_prefix || 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>(