From 179cb67cdb5e5895b735a85b3c34afdf1c506655 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Oct 2016 11:55:48 -0700 Subject: [PATCH] change order of asset upload failure changes --- interface/resources/qml/AssetServer.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/AssetServer.qml b/interface/resources/qml/AssetServer.qml index 167fe60183..8d9ff1df05 100644 --- a/interface/resources/qml/AssetServer.qml +++ b/interface/resources/qml/AssetServer.qml @@ -362,15 +362,15 @@ ScrollingWindow { console.log("Asset Browser - finished uploading: ", fileUrl); reload(); } else { + uploadSpinner.visible = false; + uploadButton.enabled = true; + uploadOpen = false; + if (err !== -1) { console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err); var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + Assets.getErrorString(err)); box.selected.connect(reload); } - - uploadSpinner.visible = false; - uploadButton.enabled = true; - uploadOpen = false; } }, dropping); }