From d4c5e4eb25a089497336a51b376a210d3db7cb06 Mon Sep 17 00:00:00 2001 From: gdh1995 Date: Tue, 27 Jun 2017 14:21:35 +0800 Subject: [PATCH] fix a potential crash caused by a null pointer e.g.: no the subfolder "Keymaps" --- src/Carnac.Logic/ShortcutProvider.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Carnac.Logic/ShortcutProvider.cs b/src/Carnac.Logic/ShortcutProvider.cs index e6add308..5960139e 100644 --- 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(); + return; + } string[] files = Directory.GetFiles(folder, filter); shortcuts = GetYamlMappings(files).Select(GetShortcuts).ToList();