loadFromUrl fix (playcanvas#2902)

slimbuck · web-flow · commit 0b05345e12d2 · 2021-02-23T00:51:25.000Z
* fix the things
diff --git a/src/asset/asset-registry.js b/src/asset/asset-registry.js
@@ -444,6 +444,10 @@ class AssetRegistry extends EventHandler {
         if (!asset) {
             asset = new Asset(name, type, file);
             self.add(asset);
+        } else if (asset.loaded) {
+            // asset is already loaded
+            callback(asset.loadFromUrlError || null, asset);
+            return;
         }
 
         var startLoad = function (asset) {
@@ -457,7 +461,11 @@ class AssetRegistry extends EventHandler {
                 }
             });
             asset.once("error", function (err) {
-                callback(err);
+                // store the error on the asset in case user requests this asset again
+                if (err) {
+                    this.loadFromUrlError = err;
+                }
+                callback(err, asset);
             });
             self.load(asset);
         };
