From dff28d3ac325a615cf7984307251c25f218e894f Mon Sep 17 00:00:00 2001 From: str Date: Sun, 30 Dec 2018 10:22:21 +0100 Subject: [PATCH] fix: Moving starred images could result in only 1 page showing after. --- .../rendering/MovedStarredImagesRenderer.ts | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/electronApp/rendering/MovedStarredImagesRenderer.ts b/src/electronApp/rendering/MovedStarredImagesRenderer.ts index 9dc829f..3b5b029 100644 --- a/src/electronApp/rendering/MovedStarredImagesRenderer.ts +++ b/src/electronApp/rendering/MovedStarredImagesRenderer.ts @@ -50,7 +50,15 @@ export namespace MoveStarredImagesRenderer { let hasErrors = false; return new Promise((resolve, reject) => { - imagePaths.forEach(imagePath => { + const done = () => { + if (hasErrors) { + reject("Some errors occurred when moving the files"); + } else { + resolve(); + } + }; + + imagePaths.forEach((imagePath, index) => { const fileName = path.basename(imagePath); const newPath = path.resolve(path.join(directoryPath, fileName)); @@ -61,14 +69,12 @@ export namespace MoveStarredImagesRenderer { } else { DataStorage.setImageAsNoStar(imagePath); } + + if (index === imagePaths.length - 1) { + done(); + } }); }); - - if (hasErrors) { - reject("Some errors occurred when moving the files"); - } else { - resolve(); - } }); } }