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

Origin commit data
------------------
Branch: ni/coolstream
Commit: d7ec14aab0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-20 (Fri, 20 Jan 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-20 18:55:56 +01:00
2 changed files with 3 additions and 3 deletions

View File

@@ -1146,9 +1146,9 @@ void CMoviePlayerGui::stopPlayBack(void)
cond.broadcast();
pthread_join(bgThread, NULL);
bgThread = 0;
livestreamInfo1.clear();
livestreamInfo2.clear();
}
livestreamInfo1.clear();
livestreamInfo2.clear();
printf("%s: stopped\n", __func__);
}