From a886963e20699192cfa0effccb312a0840f1fc97 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 3 May 2017 11:12:11 -0700
Subject: [PATCH] Fix refresh crash with ktx textures

---
 .../src/model-networking/TextureCache.cpp              | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp
index 969058c240..06ff891cb9 100644
--- a/libraries/model-networking/src/model-networking/TextureCache.cpp
+++ b/libraries/model-networking/src/model-networking/TextureCache.cpp
@@ -472,6 +472,10 @@ void NetworkTexture::startMipRangeRequest(uint16_t low, uint16_t high) {
 void NetworkTexture::ktxHeaderRequestFinished() {
     Q_ASSERT(_ktxResourceState == LOADING_INITIAL_DATA);
 
+    if (!_ktxHeaderRequest) {
+        return;
+    }
+
     _ktxHeaderRequestFinished = true;
     maybeHandleFinishedInitialLoad();
 }
@@ -479,6 +483,10 @@ void NetworkTexture::ktxHeaderRequestFinished() {
 void NetworkTexture::ktxMipRequestFinished() {
     Q_ASSERT(_ktxResourceState == LOADING_INITIAL_DATA || _ktxResourceState == REQUESTING_MIP);
 
+    if (!_ktxMipRequest) {
+        return;
+    }
+
     if (_ktxResourceState == LOADING_INITIAL_DATA) {
         _ktxHighMipRequestFinished = true;
         maybeHandleFinishedInitialLoad();
@@ -683,7 +691,7 @@ void NetworkTexture::loadContent(const QByteArray& content) {
 }
 
 void NetworkTexture::refresh() {
-    if ((_ktxHeaderRequest || _ktxMipRequest) && !loaded && !_failedToLoad) {
+    if ((_ktxHeaderRequest || _ktxMipRequest) && !_loaded && !_failedToLoad) {
         return;
     }
     if (_ktxHeaderRequest || _ktxMipRequest) {