Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output_ts_base.cpp
This commit is contained in:
Thulinma 2018-11-01 16:37:03 +01:00
commit 6a5549444b
7 changed files with 165 additions and 131 deletions

View file

@ -91,7 +91,8 @@ void statusMonitor(void *np){
WARN_MSG("Configuration semaphore was stuck. Force-unlocking it and re-writing config.");
changed = true;
}
configLock.post();
configLock.unlink();
configLock.open(SEM_CONF, O_CREAT | O_RDWR, ACCESSPERMS, 1);
if (changed || Controller::configChanged){
Controller::writeConfig();
Controller::configChanged = false;