hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_rtmp.h
This commit is contained in:
Thulinma 2016-07-21 11:41:03 +02:00
commit 2f6cd40fb3
6 changed files with 50 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/output/output.cpp
View file

@ -1034,6 +1034,7 @@ namespace Mist {
}
stats();
}
onFinish();
MEDIUM_MSG("MistOut client handler shutting down: %s, %s, %s", myConn.connected() ? "conn_active" : "conn_closed", wantRequest ? "want_request" : "no_want_request", parseData ? "parsing_data" : "not_parsing_data");
/*LTS-START*/
@ -1332,11 +1333,13 @@ namespace Mist {
nProxy.userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true);
if (!nProxy.userClient.getData()){
WARN_MSG("Player connection failure - aborting output");
onFinish();
myConn.close();
return;
}
}
if (!nProxy.userClient.isAlive()){
onFinish();
myConn.close();
return;
}