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_hls.cpp
This commit is contained in:
Thulinma 2017-12-11 13:14:44 +01:00
commit f4f644ee34
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/output/output_hls.cpp
View file

@ -346,9 +346,9 @@ namespace Mist {
H.Clean();
return;
}
if (H.url.find("hls") == std::string::npos) {
myConn.close();
if (H.url.find("hls") == std::string::npos){
onFail();
return;
}
@ -366,6 +366,7 @@ namespace Mist {
initialize();
if (!keepGoing()){
onFail();
return;
}