Merge pull request #4 from z80andrew/development

Handle case where no parameters are passed to executable
z80andrew · Apr 22, 2019 · 902667a · 902667a
2 parents 51bc51a + cf5c563
commit 902667a
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/SerialDisk/SerialDisk.cs b/SerialDisk/SerialDisk.cs
@@ -112,7 +112,10 @@ public static void Main(string[] args)
                     .Build()
                     .Bind(applicationSettings);
 
-                applicationSettings.LocalDirectoryName = ParseLocalDirectoryPath(applicationSettings, args.Last());
+                if (args.Any())
+                {
+                    applicationSettings.LocalDirectoryName = ParseLocalDirectoryPath(applicationSettings, args.Last());
+                }
             }
 
             catch (Exception parameterException)
@@ -121,7 +124,7 @@ public static void Main(string[] args)
                 return;
             }
 
-            if ((bool)args[0].ToLowerInvariant().StartsWith("--h"))
+            if (args.Any() && (bool)args[0].ToLowerInvariant().StartsWith("--h"))
             {
                 PrintUsage(applicationSettings);
                 return;
@@ -130,6 +133,9 @@ public static void Main(string[] args)
             if (String.IsNullOrEmpty(applicationSettings.LocalDirectoryName)
                 || !Directory.Exists(applicationSettings.LocalDirectoryName)) throw new Exception("Local directory name invalid.");
 
+            DirectoryInfo localDirectoryInfo = new DirectoryInfo(applicationSettings.LocalDirectoryName);
+            applicationSettings.LocalDirectoryName = localDirectoryInfo.FullName;
+
             #endregion
 
             Logger logger = new Logger(applicationSettings.LoggingLevel, applicationSettings.LogFileName);