Merge branch 'WIP' of github.com:collin80/SavvyCAN into WIP2

2016-05-31 19:56:04 -04:00
parent 135c5d1ff4 be203ffef3
commit 839027eee1
2 changed files with 8 additions and 14 deletions
@@ -478,8 +478,14 @@ void MainWindow::filterClearAll()

 void MainWindow::tickGUIUpdate()
 {
-    framesPerSec += rxFrames * 1000 / elapsedTime->elapsed() - (framesPerSec / 4);
-    elapsedTime->restart();
+    int elapsed = elapsedTime->elapsed();
+    if(elapsed) {
+        framesPerSec += rxFrames * 1000 / elapsed - (framesPerSec / 4);
+        elapsedTime->restart();
+    }
+    else
+        framesPerSec = 0;
+
    model->sendBulkRefresh(rxFrames);

    ui->lbNumFrames->setText(QString::number(model->rowCount()));