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/io.cpp
This commit is contained in:
Thulinma 2015-10-08 13:58:43 +02:00
commit c390035523
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/output/output.cpp
View file

@ -131,7 +131,7 @@ namespace Mist {
metaPages.clear();
metaPages[0].init(pageId, DEFAULT_META_PAGE_SIZE);
if (!metaPages[0].mapped){
DEBUG_MSG(DLVL_FAIL, "Could not connect to server for %s\n", streamName.c_str());
FAIL_MSG("Could not connect to server for %s", streamName.c_str());
onFail();
return;
}