Merge pull request #567 from Particular/issue566

RestoreLayout NullRef fix
Particular · Mar 11, 2016 · a4e4320 · a4e4320
2 parents 04ee7d3 + 104d374
commit a4e4320
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/ServiceInsight/Framework/Settings/SettingsProvider.cs b/src/ServiceInsight/Framework/Settings/SettingsProvider.cs
@@ -21,7 +21,9 @@ public T GetSettings<T>() where T : new()
             {
                 if (settingsRepository.HasSettings(GetKey<T>()))
                 {
-                    return LoadSettings<T>(ReadSettingMetadata<T>());
+                    var settings = LoadSettings<T>(ReadSettingMetadata<T>());
+                    if (!Equals(settings, default(T)))
+                        return settings;
                 }
                 return GetDefaultSettings<T>();
             }