Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-06-26 22:22:07 +02:00
10 changed files with 16 additions and 9 deletions

View File

@@ -306,7 +306,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
CBasicServer::receive_data(connfd, &recInfo, sizeof(CTimerd::TransferRecordingInfo));
if(recInfo.recordingSafety)
{
int pre,post;
int pre = 0,post = 0;
CTimerManager::getInstance()->getRecordingSafety(pre,post);
msgAddTimer.announceTime -= pre;
msgAddTimer.alarmTime -= pre;