Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e8fde7b21
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:56:34 +02:00
6 changed files with 24 additions and 24 deletions

View File

@@ -1027,12 +1027,12 @@ bool CMoviePlayerGui::getLiveUrl(const std::string &url, const std::string &scri
printf("[%s:%s:%d] script: %s\n", __file__, __func__, __LINE__, _s.c_str());
if (!file_exists(_s.c_str()))
{
_s = string(WEBTVDIR_VAR) + "/" + _script;
_s = std::string(WEBTVDIR_VAR) + "/" + _script;
printf("[%s:%s:%d] script: %s\n", __file__, __func__, __LINE__, _s.c_str());
}
if (!file_exists(_s.c_str()))
{
_s = string(WEBTVDIR) + "/" + _script;
_s = std::string(WEBTVDIR) + "/" + _script;
printf("[%s:%s:%d] script: %s\n", __file__, __func__, __LINE__, _s.c_str());
}
_script = _s;