Browse Source

bug fix in viewer

Raanan Weber 7 years ago
parent
commit
9082e77995
1 changed files with 6 additions and 2 deletions
  1. 6 2
      Viewer/src/viewer/viewer.ts

+ 6 - 2
Viewer/src/viewer/viewer.ts

@@ -885,7 +885,7 @@ export abstract class AbstractViewer {
             this.onModelLoadErrorObservable.notifyObserversWithPromise(errorObject);
         });
         model.onLoadProgressObservable.add((progressEvent) => {
-            return this.onModelLoadProgressObservable.notifyObserversWithPromise(progressEvent);
+            this.onModelLoadProgressObservable.notifyObserversWithPromise(progressEvent);
         });
         this.onLoaderInitObservable.notifyObserversWithPromise(this.lastUsedLoader);
 
@@ -944,7 +944,11 @@ export abstract class AbstractViewer {
         }).then(() => {
             return new Promise<ViewerModel>((resolve, reject) => {
                 // at this point, configuration.model is an object, not a string
-                return this.initModel(modelConfig, clearScene);
+                try {
+                    resolve(this.initModel(modelConfig, clearScene));
+                } catch (e) {
+                    reject(e);
+                }
             });
         })
     }