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/input/input.cpp
#	src/input/input_buffer.cpp
#	src/output/output.cpp
#	src/output/output_progressive_mp4.cpp
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2018-10-15 10:51:03 +02:00
commit ce1eef0885
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/input/input_buffer.cpp
View file

@ -510,7 +510,7 @@ namespace Mist {
nProxy.curPage.erase(tid);
bufferLocations[tid].erase(bufferLocations[tid].begin());
}
if (pushLocation.count(it->first)) {
if (pushLocation.count(it->first)){
// \todo Debugger says this is null sometimes. It shouldn't be. Figure out why!
// For now, this if will prevent crashes in these cases.
if (pushLocation[it->first]){