Merge pull request Squirrel#227 from Squirrel/parse-shortcut-fix

Avoid crashing when the user doesn't supply any shortcutLocations.
akrisiun · Feb 11, 2015 · 709a7f5 · 709a7f5
2 parents e9a1986 + 7b540a0
commit 709a7f5
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/Update/Program.cs b/src/Update/Program.cs
@@ -629,14 +629,17 @@ static string getAppNameFromDirectory(string path = null)
         static ShortcutLocation? parseShortcutLocations(string shortcutArgs)
         {
             var ret = default(ShortcutLocation?);
-            var args = shortcutArgs.Split(new[] { ',' });
-
-            foreach (var arg in args) {
-                var location = (ShortcutLocation)(Enum.Parse(typeof(ShortcutLocation), arg, false));
-                if (ret.HasValue) {
-                    ret |= location;
-                } else {
-                    ret = location;
+
+            if (!String.IsNullOrWhiteSpace(shortcutArgs)) {
+                var args = shortcutArgs.Split(new[] { ',' });
+
+                foreach (var arg in args) {
+                    var location = (ShortcutLocation)(Enum.Parse(typeof(ShortcutLocation), arg, false));
+                    if (ret.HasValue) {
+                        ret |= location;
+                    } else {
+                        ret = location;
+                    }
                 }
             }