mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
This commit is contained in:
vanhofen
2017-03-15 23:45:02 +01:00
parent aa7d4ff017 317bac3394
commit 85fab3c019
10 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/streamts.cpp
View File

@@ -267,8 +267,11 @@ bool CStreamManager::Stop()
if (!running)
return false;
running = false;
cancel();
bool ret = (OpenThreads::Thread::join() == 0);
bool ret = false;
if (OpenThreads::Thread::CurrentThread() == this) {
cancel();
ret = (OpenThreads::Thread::join() == 0);
}
StopAll();
return ret;
}