Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix websocket and config upgrade bug #1594

Merged
merged 1 commit into from
Mar 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down
1 change: 1 addition & 0 deletions src/app/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export class AppService {
}
}
this.configService.saveConfig(config);

return fullyFixed;
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/services/socket/socket.octoprint.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down