From 6ec420bdb9a9f630f3f21a33c403ba3ea49e26a8 Mon Sep 17 00:00:00 2001
From: Xjph <archseraphim@gmail.com>
Date: Sun, 6 Jun 2021 10:34:40 -0230
Subject: [PATCH] Added null check for plugin settings.

---
 .../PluginManagement/PluginManager.cs         | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/ObservatoryCore/PluginManagement/PluginManager.cs b/ObservatoryCore/PluginManagement/PluginManager.cs
index 9a4bd84..fb1c84b 100644
--- a/ObservatoryCore/PluginManagement/PluginManager.cs
+++ b/ObservatoryCore/PluginManagement/PluginManager.cs
@@ -101,17 +101,20 @@ namespace Observatory.PluginManagement
         {
             var settingNames = new Dictionary<PropertyInfo, string>();
 
-            var properties = settings.GetType().GetProperties();
-            foreach (var property in properties)
+            if (settings != null)
             {
-                var attrib = property.GetCustomAttribute<Framework.SettingDisplayName>();
-                if (attrib == null)
+                var properties = settings.GetType().GetProperties();
+                foreach (var property in properties)
                 {
-                    settingNames.Add(property, property.Name);
-                }
-                else
-                {
-                    settingNames.Add(property, attrib.DisplayName);
+                    var attrib = property.GetCustomAttribute<Framework.SettingDisplayName>();
+                    if (attrib == null)
+                    {
+                        settingNames.Add(property, property.Name);
+                    }
+                    else
+                    {
+                        settingNames.Add(property, attrib.DisplayName);
+                    }
                 }
             }
             return settingNames;