Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input_dtsc.cpp
#	src/output/output.cpp
This commit is contained in:
Thulinma 2016-07-28 20:50:29 +02:00
commit 2294fbd365
7 changed files with 22 additions and 11 deletions

View file

@ -766,6 +766,10 @@ namespace IPC {
DEBUG_MSG(DLVL_FAIL, "Creating semaphore failed: %s", strerror(errno));
return;
}
if (!mySemaphore.tryWaitOneSecond()){
WARN_MSG("Force unlocking sharedServer semaphore to prevent deadlock");
}
mySemaphore.post();
semGuard tmpGuard(&mySemaphore);
newPage();
}