Skip to content

Commit 253908a

Browse files
committed
Harden against null plugin Metadata
1 parent 39f7dad commit 253908a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

ConfigurationManager/SettingSearcher.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@ public static void CollectSettings(out IEnumerable<SettingEntryBase> results, ou
5252
var type = plugin.GetType();
5353

5454
var pluginInfo = plugin.Info.Metadata;
55+
var pluginName = pluginInfo?.Name ?? plugin.GetType().FullName;
5556

5657
if (type.GetCustomAttributes(typeof(BrowsableAttribute), false).Cast<BrowsableAttribute>()
57-
.Any(x => !x.Browsable))
58+
.Any(x => !x.Browsable))
5859
{
59-
modsWithoutSettings.Add(pluginInfo.Name);
60+
modsWithoutSettings.Add(pluginName);
6061
continue;
6162
}
6263

@@ -67,7 +68,7 @@ public static void CollectSettings(out IEnumerable<SettingEntryBase> results, ou
6768
detected.RemoveAll(x => x.Browsable == false);
6869

6970
if (detected.Count == 0)
70-
modsWithoutSettings.Add(pluginInfo.Name);
71+
modsWithoutSettings.Add(pluginName);
7172

7273
// Allow to enable/disable plugin if it uses any update methods ------
7374
if (showDebug && type.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic).Any(x => _updateMethodNames.Contains(x.Name)))

0 commit comments

Comments
 (0)