fix websocket and config upgrade bug (#1594)

UnchartedBull · Mar 23, 2021 · 653d900 · 653d900
1 parent c26a901
commit 653d900
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -48,7 +48,7 @@ export class AppComponent implements OnInit {
 
     if (this.service.hasUpdateError(errors)) {
       if (this.service.fixUpdateErrors(errors)) {
-        this.initialize();
+        setTimeout(this.initialize.bind(this), 1500);
       } else {
         this.configService.setUpdate();
         this.router.navigate(['/no-config']);

diff --git a/src/app/app.service.ts b/src/app/app.service.ts
@@ -78,6 +78,7 @@ export class AppService {
       }
     }
     this.configService.saveConfig(config);
+
     return fullyFixed;
   }
 

diff --git a/src/app/services/socket/socket.octoprint.service.ts b/src/app/services/socket/socket.octoprint.service.ts
@@ -238,7 +238,7 @@ export class OctoPrintSocketService implements SocketService {
   private getTotalFilamentWeight(filament: OctoprintFilament) {
     let filamentLength = 0;
     _.forEach(filament, (tool): void => {
-      filamentLength += tool.length;
+      filamentLength += tool?.length;
     });
     return this.conversionService.convertFilamentLengthToWeight(filamentLength);
   }