diff --git a/src/app/components/browse/status-bar/downloads-modal/downloads-modal.component.ts b/src/app/components/browse/status-bar/downloads-modal/downloads-modal.component.ts index 3563207..fb06b93 100644 --- a/src/app/components/browse/status-bar/downloads-modal/downloads-modal.component.ts +++ b/src/app/components/browse/status-bar/downloads-modal/downloads-modal.component.ts @@ -46,7 +46,6 @@ export class DownloadsModalComponent { switch (download.type) { case 'good': return 'unset' case 'done': return 'unset' - case 'warning': return 'yellow' case 'error': return 'indianred' } } diff --git a/src/electron/ipc/download/ChartDownload.ts b/src/electron/ipc/download/ChartDownload.ts index 508411a..3cb8289 100644 --- a/src/electron/ipc/download/ChartDownload.ts +++ b/src/electron/ipc/download/ChartDownload.ts @@ -87,7 +87,9 @@ export class ChartDownload { const cancelFn = this.cancelFn this.cancelFn = undefined cancelFn() - rimraf(this.chartPath) // Delete temp folder + try { + rimraf(this.chartPath) // Delete temp folder + } catch (e) { /** Do nothing */ } } } diff --git a/src/electron/ipc/download/DownloadHandler.ts b/src/electron/ipc/download/DownloadHandler.ts index 4405352..c047be1 100644 --- a/src/electron/ipc/download/DownloadHandler.ts +++ b/src/electron/ipc/download/DownloadHandler.ts @@ -68,7 +68,7 @@ class DownloadHandler implements IPCEmitHandler<'download'> { private startNextDownload() { if (!this.downloadQueue.isEmpty()) { - this.currentDownload = this.downloadQueue.pop() + this.currentDownload = this.downloadQueue.shift() if (this.currentDownload.hasFailed) { this.currentDownload.retry() } else { diff --git a/src/electron/ipc/download/DownloadQueue.ts b/src/electron/ipc/download/DownloadQueue.ts index 52d4bc9..ba8960d 100644 --- a/src/electron/ipc/download/DownloadQueue.ts +++ b/src/electron/ipc/download/DownloadQueue.ts @@ -15,7 +15,7 @@ export class DownloadQueue { this.sort() } - pop() { + shift() { return this.downloadQueue.shift() } diff --git a/src/electron/shared/interfaces/download.interface.ts b/src/electron/shared/interfaces/download.interface.ts index 37f6735..b1a7bbe 100644 --- a/src/electron/shared/interfaces/download.interface.ts +++ b/src/electron/shared/interfaces/download.interface.ts @@ -31,8 +31,4 @@ export interface DownloadProgress { type: ProgressType } -export type ProgressType = 'good' | 'warning' | 'error' | 'cancel' | 'done' | 'fastUpdate' -// export function downloadSorter(p1: DownloadProgress, p2: DownloadProgress) { -// return 0 -// // return p1 - p2 // negative if p1 < p2 -// } \ No newline at end of file +export type ProgressType = 'good' | 'error' | 'cancel' | 'done' | 'fastUpdate' \ No newline at end of file