Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2017-04-18 12:32:39 +02:00
commit 7629b00a4c
10 changed files with 65 additions and 17 deletions

View file

@ -328,6 +328,7 @@ namespace Mist{
if (nProxy.userClient.getData()){
nProxy.userClient.finish();
}
nProxy.streamName = streamName;
char userPageName[NAME_BUFFER_SIZE];
snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str());
unsigned int attempts = 0;