From 3888385a7294556c617283baa839dd2e99474b0f Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 1 Jun 2017 18:19:13 -0700
Subject: [PATCH] Remove the runningMarker timer

---
 interface/src/main.cpp                 |  5 +---
 libraries/shared/src/RunningMarker.cpp | 35 +-------------------------
 libraries/shared/src/RunningMarker.h   | 12 +--------
 3 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index a22130377a..83cac6d9bb 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -190,7 +190,7 @@ int main(int argc, const char* argv[]) {
 
     int exitCode;
     {
-        RunningMarker runningMarker(nullptr, RUNNING_MARKER_FILENAME);
+        RunningMarker runningMarker(RUNNING_MARKER_FILENAME);
         bool runningMarkerExisted = runningMarker.fileExists();
         runningMarker.writeRunningMarkerFile();
 
@@ -204,9 +204,6 @@ int main(int argc, const char* argv[]) {
 
         Application app(argc, const_cast<char**>(argv), startupTime, runningMarkerExisted);
 
-        // Now that the main event loop is setup, launch running marker thread
-        runningMarker.startRunningMarker();
-
         // If we failed the OpenGLVersion check, log it.
         if (override) {
             auto accountManager = DependencyManager::get<AccountManager>();
diff --git a/libraries/shared/src/RunningMarker.cpp b/libraries/shared/src/RunningMarker.cpp
index 0c1fd06df8..cb7b39320c 100644
--- a/libraries/shared/src/RunningMarker.cpp
+++ b/libraries/shared/src/RunningMarker.cpp
@@ -13,44 +13,16 @@
 
 #include <QFile>
 #include <QStandardPaths>
-#include <QThread>
-#include <QTimer>
 
-#include "NumericalConstants.h"
 #include "PathUtils.h"
 
-RunningMarker::RunningMarker(QObject* parent, QString name) :
-    _parent(parent),
+RunningMarker::RunningMarker(QString name) :
     _name(name)
 {
 }
 
-void RunningMarker::startRunningMarker() {
-    static const int RUNNING_STATE_CHECK_IN_MSECS = MSECS_PER_SECOND;
-
-    // start the nodeThread so its event loop is running
-    _runningMarkerThread = new QThread(_parent);
-    _runningMarkerThread->setObjectName("Running Marker Thread");
-    _runningMarkerThread->start();
-
-    writeRunningMarkerFile(); // write the first file, even before timer
-
-    _runningMarkerTimer = new QTimer();
-    QObject::connect(_runningMarkerTimer, &QTimer::timeout, [=](){
-        writeRunningMarkerFile();
-    });
-    _runningMarkerTimer->start(RUNNING_STATE_CHECK_IN_MSECS);
-
-    // put the time on the thread
-    _runningMarkerTimer->moveToThread(_runningMarkerThread);
-}
-
 RunningMarker::~RunningMarker() {
     deleteRunningMarkerFile();
-    QMetaObject::invokeMethod(_runningMarkerTimer, "stop", Qt::BlockingQueuedConnection);
-    _runningMarkerThread->quit();
-    _runningMarkerTimer->deleteLater();
-    _runningMarkerThread->deleteLater();
 }
 
 bool RunningMarker::fileExists() const {
@@ -77,8 +49,3 @@ void RunningMarker::deleteRunningMarkerFile() {
 QString RunningMarker::getFilePath() const {
     return QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + _name;
 }
-
-QString RunningMarker::getMarkerFilePath(QString name) {
-    return QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + name;
-}
-
diff --git a/libraries/shared/src/RunningMarker.h b/libraries/shared/src/RunningMarker.h
index f9c8e72d37..ae7c550660 100644
--- a/libraries/shared/src/RunningMarker.h
+++ b/libraries/shared/src/RunningMarker.h
@@ -12,21 +12,14 @@
 #ifndef hifi_RunningMarker_h
 #define hifi_RunningMarker_h
 
-#include <QObject>
 #include <QString>
 
-class QThread;
-class QTimer;
-
 class RunningMarker {
 public:
-    RunningMarker(QObject* parent, QString name);
+    RunningMarker(QString name);
     ~RunningMarker();
 
-    void startRunningMarker();
-
     QString getFilePath() const;
-    static QString getMarkerFilePath(QString name);
 
     bool fileExists() const;
 
@@ -34,10 +27,7 @@ public:
     void deleteRunningMarkerFile();
 
 private:
-    QObject* _parent { nullptr };
     QString _name;
-    QThread* _runningMarkerThread { nullptr };
-    QTimer* _runningMarkerTimer { nullptr };
 };
 
 #endif // hifi_RunningMarker_h