Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6179aa7d38
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-12 (Mon, 12 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-06-12 11:27:38 +02:00

View File

@@ -951,7 +951,7 @@ bool CMoviePlayerGui::selectLivestream(std::vector<livestream_info_t> &streamLis
#endif
bool resIO = false;
while (1) {
while (!streamList.empty()) {
size_t i;
for (i = 0; i < streamList.size(); ++i) {
_info = &(streamList[i]);