Merge branch 'unstable' of https://github.com/opentrack/opentrack into osx-build-fix

2 files changed, 4 insertions, 4 deletions

diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
index 491d1214..7cb25d18 100644
--- a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
+++ b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
@@ -177,8 +177,8 @@ void dialog_hatire::poll_tracker_info()
         int frame_cnt;
 
         theTracker->get_info(&frame_cnt);
-        ui.lab_vtps->setText(QString::number(frame_cnt*(1000/last_time.elapsed())));
-        last_time.restart();
+        ui.lab_vtps->setText(QString::number(frame_cnt*(1000/last_time.elapsed_ms())));
+        last_time.start();
     }
 }
 
diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.h b/tracker-hatire/ftnoir_tracker_hat_dialog.h
index 7577445c..c578f22f 100644
--- a/tracker-hatire/ftnoir_tracker_hat_dialog.h
+++ b/tracker-hatire/ftnoir_tracker_hat_dialog.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include "api/plugin-api.hpp"
+#include "compat/timer.hpp"
 #include "ftnoir_tracker_hat_settings.h"
 #include "ftnoir_tracker_hat.h"
 #include "ui_ftnoir_hatcontrols.h"
 #include <QObject>
 #include <QWidget>
-#include <QTime>
 #include <QTimer>
 #include <QMessageBox>
 #include <QMetaType>
@@ -25,7 +25,7 @@ public:
 private:
     Ui::UIHATControls ui;
     hatire *theTracker;
-    QTime last_time;
+    Timer last_time;
 
 public  slots:
     void WriteMsgInfo(const QByteArray &MsgInfo);