Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fdbea4bb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-06 01:01:16 +01:00
2 changed files with 18 additions and 13 deletions

View File

@@ -501,7 +501,9 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
break;
}
do {
#if ! HAVE_COOL_HARDWARE
is_file_player = true;
#endif
PlayFile();
}
while (repeat_mode || filelist_it != filelist.end());