From b8114b29b23a1b286ee6b0c96f6fc566f705f8df Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 16 Dec 2016 09:47:11 +1300
Subject: [PATCH] Make manually closing message box code more correct

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2052253888..1eacd179fb 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5974,12 +5974,13 @@ void Application::addAssetToWorldMessageClose() {
 }
 
 void Application::onAssetToWorldMessageBoxClosed() {
-    // User manually closed message box.
-
-    qInfo(interfaceapp) << "User manually closed download status message box";
-    disconnect(_addAssetToWorldMessageBox);
-    _addAssetToWorldMessageBox = nullptr;
-    addAssetToWorldMessageClose();
+    if (_addAssetToWorldMessageBox) {
+        // User manually closed message box; perhaps because it has become stuck, so reset all messages.
+        qInfo(interfaceapp) << "User manually closed download status message box";
+        disconnect(_addAssetToWorldMessageBox);
+        _addAssetToWorldMessageBox = nullptr;
+        addAssetToWorldMessageClose();
+    }
 }