From 6623bd765120292f0e15f097f23326a0bc93bde1 Mon Sep 17 00:00:00 2001 From: tstellanova Date: Wed, 28 Aug 2013 18:23:56 -0700 Subject: [PATCH] stop timer when maxSilenceTimeout is exceeded to avoid infinite loop --- src/uas/UASParameterCommsMgr.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/uas/UASParameterCommsMgr.cc b/src/uas/UASParameterCommsMgr.cc index d33eed747..126a6910f 100644 --- a/src/uas/UASParameterCommsMgr.cc +++ b/src/uas/UASParameterCommsMgr.cc @@ -253,6 +253,8 @@ void UASParameterCommsMgr::silenceTimerExpired() qDebug() << "maxSilenceTimeout exceeded: " << totalElapsed; int missingReads, missingWrites; clearRetransmissionLists(missingReads,missingWrites); + silenceTimer.stop(); + lastSilenceTimerReset = curTime; setParameterStatusMsg(tr("TIMEOUT: Abandoning %1 reads %2 writes after %3 seconds").arg(missingReads).arg(missingWrites).arg(totalElapsed/1000)); } else { -- 2.22.0