From a33c4d4b8c7fa56671c97e8d1955f692594a7d14 Mon Sep 17 00:00:00 2001
From: str <str_ie@yahoo.co.uk>
Date: Fri, 17 Jan 2020 20:44:11 +0100
Subject: [PATCH] fix: Fix alias -i

---
 src/main.ts                  | 2 +-
 src/utils/SharedDataUtils.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 6e26c54..f62ede0 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -49,7 +49,7 @@ function launchChocolateBarsApp() {
         const electronArgs = [
             // MUST align with SharedDataUtils.ts and ImageSizeExecutor.ts:
             appPath,
-            ...process.argv.filter(a => !a.startsWith("--imageDir")),
+            ...process.argv,
             `--imageDir=${ArgsParser.encodeSpaces(parsedArgs.imageDir)}`
         ];
 
diff --git a/src/utils/SharedDataUtils.ts b/src/utils/SharedDataUtils.ts
index 14aa5cc..bfa4c72 100644
--- a/src/utils/SharedDataUtils.ts
+++ b/src/utils/SharedDataUtils.ts
@@ -10,8 +10,13 @@ export namespace SharedDataUtils {
     export function getArgs(): ChocolateBarsArgs {
         const args = remote.getGlobal("sharedObject") as ChocolateBarsArgs;
 
-        args.imageDir = ArgsParser.decodeSpaces(args.imageDir);
+        args.imageDir = ArgsParser.decodeSpaces(ensureIsString(args.imageDir));
 
         return args;
     }
+
+    // With cli usage of '-i', the encoded imageDir appears twice, so we get an array
+    function ensureIsString(imageDir: string | string[]): string {
+        return Array.isArray(imageDir) ? imageDir[imageDir.length - 1] : imageDir;
+    }
 }