From 7d8e14f51055dfbf00a0d42da57077c958a14e40 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 13 May 2019 18:19:29 -0700
Subject: [PATCH 1/2] Additional silencing of watchdog spam

---
 interface/src/Application.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0e8c03e032..a8884d508e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -441,6 +441,7 @@ public:
             auto elapsedMovingAverage = _movingAverage.getAverage();
 
             if (elapsedMovingAverage > _maxElapsedAverage) {
+#if !defined(NDEBUG)
                 qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
                     << "lastHeartbeatAge:" << lastHeartbeatAge
                     << "elapsedMovingAverage:" << elapsedMovingAverage
@@ -448,9 +449,11 @@ public:
                     << "PREVIOUS maxElapsedAverage:" << _maxElapsedAverage
                     << "NEW maxElapsedAverage:" << elapsedMovingAverage << "** NEW MAX ELAPSED AVERAGE **"
                     << "samples:" << _movingAverage.getSamples();
+#endif
                 _maxElapsedAverage = elapsedMovingAverage;
             }
             if (lastHeartbeatAge > _maxElapsed) {
+#if !defined(NDEBUG)
                 qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
                     << "lastHeartbeatAge:" << lastHeartbeatAge
                     << "elapsedMovingAverage:" << elapsedMovingAverage
@@ -458,8 +461,11 @@ public:
                     << "NEW maxElapsed:" << lastHeartbeatAge << "** NEW MAX ELAPSED **"
                     << "maxElapsedAverage:" << _maxElapsedAverage
                     << "samples:" << _movingAverage.getSamples();
+#endif
                 _maxElapsed = lastHeartbeatAge;
             }
+
+#if !defined(NDEBUG)
             if (elapsedMovingAverage > WARNING_ELAPSED_HEARTBEAT) {
                 qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
                     << "lastHeartbeatAge:" << lastHeartbeatAge
@@ -468,6 +474,7 @@ public:
                     << "maxElapsedAverage:" << _maxElapsedAverage
                     << "samples:" << _movingAverage.getSamples();
             }
+#endif
 
             if (lastHeartbeatAge > MAX_HEARTBEAT_AGE_USECS) {
                 qCDebug(interfaceapp_deadlock) << "DEADLOCK DETECTED -- "

From fe6b2fceed572e127b722dc93a16f5a97d9af960 Mon Sep 17 00:00:00 2001
From: amerhifi <amer@highfidelity.io>
Date: Tue, 14 May 2019 09:39:44 -0700
Subject: [PATCH 2/2] addressing comment in pr. removing extra space added in
 previous checkin

---
 interface/src/Application.h       | 4 +---
 libraries/shared/src/GPUIdent.cpp | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.h b/interface/src/Application.h
index 72f7d1f189..34a5ba1d0c 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -1,4 +1,4 @@
-//
+//
 //  Application.h
 //  interface/src
 //
@@ -78,8 +78,6 @@
 
 #include "Sound.h"
 
-
-
 class GLCanvas;
 class FaceTracker;
 class MainWindow;
diff --git a/libraries/shared/src/GPUIdent.cpp b/libraries/shared/src/GPUIdent.cpp
index 6bb445e15a..a78ded483b 100644
--- a/libraries/shared/src/GPUIdent.cpp
+++ b/libraries/shared/src/GPUIdent.cpp
@@ -251,7 +251,7 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer)
     */
 
     if (!validAdapterList.empty()) {
-        for (auto outy = adapterToOutputs.begin(); outy != adapterToOutputs.end(); outy++) {
+        for (auto outy = adapterToOutputs.begin(); outy != adapterToOutputs.end(); ++outy) {
 
 			AdapterEntry entry = *outy;
             for (auto test = entry.second.begin(); test != entry.second.end(); ++test) {