fix for server operation on Mac
This commit is contained in:
parent
4a7041a7ea
commit
11b1c2b916
1 changed files with 3 additions and 6 deletions
|
@ -67,11 +67,8 @@ void CHighPrecisionTimer::Stop()
|
||||||
// set flag so that thread can leave the main loop
|
// set flag so that thread can leave the main loop
|
||||||
bRun = false;
|
bRun = false;
|
||||||
|
|
||||||
// TODO (since for the server the stopping is not critical, we
|
// give thread some time to terminate
|
||||||
// can live with not to have a nice thread terminating for now)
|
wait ( 5000 );
|
||||||
// TODO the wait is not a good solution
|
|
||||||
// // give thread some time to terminate
|
|
||||||
// wait ( 5000 );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CHighPrecisionTimer::run()
|
void CHighPrecisionTimer::run()
|
||||||
|
@ -369,7 +366,7 @@ void CServer::OnTimer()
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
CVector<int> vecChanID;
|
CVector<int> vecChanID;
|
||||||
CVector<CVector<double> > vecvecdGains;
|
CVector<CVector<double> > vecvecdGains;
|
||||||
CVector<CVector<int16_t> > vecvecsData;
|
CVector<CVector<int16_t> > vecvecsData;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue