Merge pull request #158 from bfritscher/missing-keymaps-null-pointer

Fix a potential crash caused by a null pointer
Code52 · Jul 12, 2017 · 82bac34 · 82bac34
2 parents 79ec797 + d4c5e4e
commit 82bac34
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Carnac.Logic/ShortcutProvider.cs b/src/Carnac.Logic/ShortcutProvider.cs
@@ -15,7 +15,11 @@ public ShortcutProvider()
         {
             string folder = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName) + @"\Keymaps\";
             string filter = "*.yml";
-            if (!Directory.Exists(folder)) return;
+            if (!Directory.Exists(folder))
+            {
+                shortcuts = new List<ShortcutCollection>();
+                return;
+            }
             string[] files = Directory.GetFiles(folder, filter);
 
             shortcuts = GetYamlMappings(files).Select(GetShortcuts).ToList();