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 2017-01-31 15:42:14 +01:00
commit 8756680d2e
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/io.cpp
View file

@ -150,9 +150,6 @@ namespace Mist {
char pageId[NAME_BUFFER_SIZE];
snprintf(pageId, NAME_BUFFER_SIZE, SHM_TRACK_DATA, streamName.c_str(), mapTid, pageNumber);
int pageSize = pagesByTrack[tid][pageNumber].dataSize;
#ifdef __CYGWIN__
pageSize = 26 * 1024 * 1024;
#endif
/*LTS-START*/
if (encrypt){
pageSize = pageSize * 1.5;