fixed jimp upload to not hang when error occurs. fied imagebox to show original image if resized images fail.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/client/views/nodes/LoadingBox.tsx b/src/client/views/nodes/LoadingBox.tsx
index 01dd830f8..e554cb8ad 100644
--- a/src/client/views/nodes/LoadingBox.tsx
+++ b/src/client/views/nodes/LoadingBox.tsx
@@ -63,13 +63,14 @@ export class LoadingBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
             const updateFunc = async () => {
                 const result = await Networking.QueryYoutubeProgress(StrCast(this.Document[Id])); // We use the guid of the overwriteDoc to track file uploads.
                 runInAction(() => (this.progress = result.progress));
-                !this.Document.loadingError && (this._timer = setTimeout(updateFunc, 1000));
+                !this.Document.loadingError && this._timer && (this._timer = setTimeout(updateFunc, 1000));
             };
             this._timer = setTimeout(updateFunc, 1000);
         }
     }
     componentWillUnmount() {
         clearTimeout(this._timer);
+        this._timer = undefined;
     }
 
     render() {