From d23d0f64326efc4ebb6cb41afa69ebafd4e54ffa Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Mon, 4 Apr 2016 10:57:04 -0700
Subject: [PATCH] Restore thread priority after tex parsing

---
 .../src/model-networking/TextureCache.cpp     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp
index ff189b46f7..bbe907694a 100644
--- a/libraries/model-networking/src/model-networking/TextureCache.cpp
+++ b/libraries/model-networking/src/model-networking/TextureCache.cpp
@@ -11,20 +11,22 @@
 
 #include "TextureCache.h"
 
+#include <QNetworkReply>
+#include <QPainter>
+#include <QRunnable>
+#include <QThreadPool>
+#include <QImageReader>
+
 #include <mutex>
 
 #include <glm/glm.hpp>
 #include <glm/gtc/random.hpp>
 
-#include <QNetworkReply>
-#include <QPainter>
-#include <QRunnable>
-#include <QThreadPool>
-#include <qimagereader.h>
-#include <PathUtils.h>
-
 #include <gpu/Batch.h>
 
+#include <Finally.h>
+#include <PathUtils.h>
+
 #include "ModelNetworkingLogging.h"
 
 TextureCache::TextureCache() {
@@ -283,10 +285,12 @@ void ImageReader::run() {
         originalPriority = QThread::NormalPriority;
     }
     QThread::currentThread()->setPriority(QThread::LowPriority);
+    Finally restorePriority([originalPriority]{
+        QThread::currentThread()->setPriority(originalPriority);
+    });
 
     if (!_resource.data()) {
         qCWarning(modelnetworking) << "Abandoning load of" << _url << "; could not get strong ref";
-        QThread::currentThread()->setPriority(originalPriority);
         return;
     }
 
@@ -318,7 +322,6 @@ void ImageReader::run() {
         auto resource = _resource.toStrongRef();
         if (!resource) {
             qCWarning(modelnetworking) << "Abandoning load of" << _url << "; could not get strong ref";
-            QThread::currentThread()->setPriority(originalPriority);
             return;
         }
 
@@ -336,8 +339,6 @@ void ImageReader::run() {
             Q_ARG(void*, texture),
             Q_ARG(int, originalWidth), Q_ARG(int, originalHeight));
     }
-
-    QThread::currentThread()->setPriority(originalPriority);
 }
 
 void NetworkTexture::setImage(void* voidTexture, int originalWidth,