From 9840e9fe89aaf0beebbfe75f7372ca1c99a67007 Mon Sep 17 00:00:00 2001 From: john liddell Date: Tue, 6 Oct 2020 22:47:52 -0500 Subject: [PATCH] Fix an issue not waitinfg for addon sync to finish. --- .../src/app/business-objects/my-addons-list-item.ts | 4 ++-- wowup-electron/src/app/pages/my-addons/my-addons.component.ts | 1 + wowup-electron/src/app/services/addons/addon.service.ts | 2 +- wowup-electron/src/app/services/warcraft/warcraft.service.ts | 4 ++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wowup-electron/src/app/business-objects/my-addons-list-item.ts b/wowup-electron/src/app/business-objects/my-addons-list-item.ts index 8c94dd70..439e64e7 100644 --- a/wowup-electron/src/app/business-objects/my-addons-list-item.ts +++ b/wowup-electron/src/app/business-objects/my-addons-list-item.ts @@ -48,7 +48,7 @@ export class MyAddonsListItem { return AddonDisplayState.Install; } - if (this.addon.installedVersion != this.addon.latestVersion) { + if (this.addon.installedVersion !== this.addon.latestVersion) { return AddonDisplayState.Update; } @@ -65,7 +65,6 @@ export class MyAddonsListItem { } public onClicked() { - console.log(this.addon.name); this.selected = !this.selected; } @@ -79,6 +78,7 @@ export class MyAddonsListItem { case AddonDisplayState.Install: case AddonDisplayState.Unknown: default: + console.log('Unhandled display state', this.displayState) return ''; } } diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts index 95b8efba..e77dee4d 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts @@ -374,6 +374,7 @@ export class MyAddonsComponent implements OnInit, OnDestroy { }); }, error: (err) => { + console.error(err); this.isBusy = false; this.enableControls = true; } diff --git a/wowup-electron/src/app/services/addons/addon.service.ts b/wowup-electron/src/app/services/addons/addon.service.ts index 157cf70e..317b1a24 100644 --- a/wowup-electron/src/app/services/addons/addon.service.ts +++ b/wowup-electron/src/app/services/addons/addon.service.ts @@ -306,7 +306,7 @@ export class AddonService { this.updateAddons(addons, newAddons); } - this.syncAddons(clientType, addons); + await this.syncAddons(clientType, addons); return addons; } diff --git a/wowup-electron/src/app/services/warcraft/warcraft.service.ts b/wowup-electron/src/app/services/warcraft/warcraft.service.ts index 67846d12..4f77bcdc 100644 --- a/wowup-electron/src/app/services/warcraft/warcraft.service.ts +++ b/wowup-electron/src/app/services/warcraft/warcraft.service.ts @@ -167,6 +167,10 @@ export class WarcraftService { public async listAddons(clientType: WowClientType) { const addonFolders: AddonFolder[] = []; + if (clientType === WowClientType.None) { + return addonFolders; + } + const addonFolderPath = this.getAddonFolderPath(clientType); // Folder may not exist if no addons have been installed