Added a check for the MessagePath configuration loader which will now…

… soft fail if it cannot load the configuration.
ChangemakerStudios · Dec 6, 2017 · 5cf79a6 · 5cf79a6
1 parent 595e69c
commit 5cf79a6
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/src/Papercut.UI/SettingPathTemplateProvider.cs b/src/Papercut.UI/SettingPathTemplateProvider.cs
@@ -40,15 +40,32 @@ public SettingPathTemplateProvider(ILogger logger)
             PathTemplates = new ObservableCollection<string>(MessagePaths);
         }
 
-        IEnumerable<string> MessagePaths
+        private IEnumerable<string> MessagePaths
         {
             get
             {
-                return
-                    Settings.Default.MessagePaths.Split(new[] { ';', ',' })
-                        .Select(s => s.Trim())
-                        .Where(s => !string.IsNullOrWhiteSpace(s))
-                        .Distinct();
+
+                return GetMessagePath()
+                    .Split(new[] { ';', ',' })
+                    .Select(s => s.Trim())
+                    .Where(s => !string.IsNullOrWhiteSpace(s))
+                    .Distinct();
+            }
+        }
+
+        private string GetMessagePath()
+        {
+            try
+            {
+                return Settings.Default.MessagePaths;
+            }
+            catch (System.Exception ex)
+            {
+                // message path loading is failing
+                this._logger.Error(ex, "Failed to load message paths");
+
+                // use default
+                return "%ApplicationData%\\Papercut;%BaseDirectory%;%BaseDirectory%\\Incoming";
             }
         }