Merge branch 'master' into api4

This commit is contained in:
Ottermandias 2021-08-29 16:19:10 +02:00
commit 33702f9d7a
2 changed files with 4 additions and 4 deletions

View file

@ -74,14 +74,14 @@ namespace Penumbra.Mods
{
if( Settings.TryGetValue( mod.BasePath.Name, out var settings ) )
{
Cache.AddMod( settings, mod );
Cache.AddMod( settings, mod, false );
}
else
{
changedSettings = true;
var newSettings = ModSettings.DefaultSettings( mod.Meta );
Settings.Add( mod.BasePath.Name, newSettings );
Cache.AddMod( newSettings, mod );
Cache.AddMod( newSettings, mod, false );
}
}

View file

@ -126,14 +126,14 @@ namespace Penumbra.Mods
private static readonly PriorityComparer Comparer = new();
public void AddMod( ModSettings settings, ModData data )
public void AddMod( ModSettings settings, ModData data, bool updateFileList = true )
{
if( !AvailableMods.TryGetValue( data.BasePath.Name, out var existingMod ) )
{
var newMod = new Mod.Mod( settings, data );
AvailableMods[ data.BasePath.Name ] = newMod;
if( settings.Enabled )
if( updateFileList && settings.Enabled )
{
CalculateEffectiveFileList();
if( data.Resources.MetaManipulations.Count > 0 )