FlightPlanner: prevent exception

Author: meee1

GCSViews/FlightPlanner.cs

@@ -5280,11 +5280,15 @@ private Dictionary<string, string[]> readCMDXML()
             //Load additional commands from config.xml and merge it with cmd
             try
             {
-                Dictionary<string, string[]> configCommands = new Dictionary<string, string[]>();
-                configCommands = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(Settings.Instance["PlannerExtraCommand"]);
-                var newCmdList = cmd.Concat(configCommands.Where(kvp => !cmd.ContainsKey(kvp.Key))).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-                return newCmdList;
+                if (Settings.Instance["PlannerExtraCommand"] != null)
+                {
+                    Dictionary<string, string[]> configCommands = new Dictionary<string, string[]>();
+                    configCommands = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(Settings.Instance["PlannerExtraCommand"]);
+                    var newCmdList = cmd.Concat(configCommands.Where(kvp => !cmd.ContainsKey(kvp.Key))).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+                    return newCmdList;
+                }
 
+                return cmd;
             }
             catch
             {

appveyor.yml

@@ -49,12 +49,6 @@ artifacts:
 - path: ChangeLog.txt
 deploy: off
 notifications:
-- provider: Webhook
-  url: https://webhooks.gitter.im/e/c7f1e74edef028cfa905
-  method: POST
-  on_build_success: true
-  on_build_failure: false
-  on_build_status_changed: false
 - provider: GitHubPullRequest
   on_build_success: true
   on_build_failure: true