Fixed bug where protocol splitting didn't require :// but any of :, / or /

diff --git a/core/parameters/parameters.cpp b/core/parameters/parameters.cpp
index 4aaaf53c6a16feab184541718bdcb63e1fb29d29..91a30ebb93423049b6871092cde6ffd35e6714c5 100644 (file)
--- a/core/parameters/parameters.cpp
+++ b/core/parameters/parameters.cpp
@@ -74,7 +74,7 @@ std::vector<std::wstring> parameters::protocol_split(std::wstring const& s)
 {
        std::vector<std::wstring> result;
        size_t pos;
-       if ((pos = s.find_first_of(L"://")) != std::wstring::npos)
+       if ((pos = s.find(L"://")) != std::wstring::npos)
        {
                result.push_back(s.substr(0, pos));
                result.push_back(s.substr(pos + 3));

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 7d909e1e23a9faa962570128f2b8e7e3a03c20df..3709fbe09c6f2f4cf1b781f361239e7225c77677 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -350,21 +350,4 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& fa
        return create_producer(factory, params);\r
 }\r
 \r
-std::vector<std::wstring> protocol_split(std::wstring const& s)\r
-{\r
-  std::vector<std::wstring> result;\r
-  size_t pos;\r
-  if ((pos = s.find_first_of(L"://")) != std::wstring::npos)\r
-  {\r
-    result.push_back(s.substr(0, pos));\r
-    result.push_back(s.substr(pos + 3));\r
-  } else\r
-  {\r
-    result.push_back(L"");\r
-    result.push_back(s);\r
-  }\r
-  return result;\r
-}\r
-\r
-\r
 }}
\ No newline at end of file