From e1e4933fb3afc6ea041d6da29ccafb29ad4945ba Mon Sep 17 00:00:00 2001
From: ykeara <ykeara1@gmail.com>
Date: Wed, 3 Jun 2020 11:42:58 -0500
Subject: [PATCH] Turn Counter Center Marker Fix (#463)

* fixed center marker rotation count

* updated version strings

* fixed Trigger Condition
---
 build_scripts/compile_version_string.txt      |  2 +-
 src/tabcontrollers/ChaperoneTabController.cpp | 11 ++++++++---
 ver/versioncheck.json                         |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/build_scripts/compile_version_string.txt b/build_scripts/compile_version_string.txt
index f69a7d1..3b51fcf 100644
--- a/build_scripts/compile_version_string.txt
+++ b/build_scripts/compile_version_string.txt
@@ -1 +1 @@
-5.1.1-dev
\ No newline at end of file
+5.1.2-release
\ No newline at end of file
diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp
index 34db2cb..22e5b4e 100644
--- a/src/tabcontrollers/ChaperoneTabController.cpp
+++ b/src/tabcontrollers/ChaperoneTabController.cpp
@@ -245,6 +245,13 @@ void ChaperoneTabController::eventLoopTick(
 {
     m_trackingUniverse = universe;
 
+    if ( centerMarkerNew() )
+    {
+        // This Runs Independently of Updates to orientation and position of
+        // center Marker This also only runs Every ~.5 seconds
+        checkCenterMarkerOverlayRotationCount();
+    }
+
     if ( devicePoses )
     {
         m_isHMDActive = false;
@@ -1589,8 +1596,6 @@ void ChaperoneTabController::updateCenterMarkerOverlay(
             m_trackingUniverse,
             ( centerPlaySpaceMatrix ),
             "" );
-
-        checkCenterMarkerOverlayRotationCount();
     }
 }
 
@@ -1651,7 +1656,7 @@ void ChaperoneTabController::checkCenterMarkerOverlayRotationCount()
             }
         }
 
-        if ( rotationNext != m_rotationCurrent )
+        if ( rotationNext != m_rotationCurrent && m_centerMarkerOverlayIsInit )
         {
             m_rotationCurrent = rotationNext;
             ovr_overlay_wrapper::setOverlayFromFile(
diff --git a/ver/versioncheck.json b/ver/versioncheck.json
index 41db930..a4f187c 100644
--- a/ver/versioncheck.json
+++ b/ver/versioncheck.json
@@ -1 +1 @@
-{ "major": 5, "minor": 1, "patch": 1, "updateMessage": "", "optionalMessage": "" }
\ No newline at end of file
+{ "major": 5, "minor": 1, "patch": 2, "updateMessage": "", "optionalMessage": "" }
\ No newline at end of file