mirror of
https://github.com/xivdev/Penumbra.git
synced 2026-01-02 05:43:42 +01:00
Merge remote-tracking branch 'origin/master' into services
This commit is contained in:
commit
a88332d3bc
3 changed files with 10 additions and 7 deletions
|
|
@ -40,7 +40,9 @@ public partial class Mod
|
|||
{
|
||||
var modFiles = AllFiles.ToHashSet();
|
||||
return ModPath.EnumerateDirectories()
|
||||
.Where(d => !d.Attributes.HasFlag( FileAttributes.Hidden ) )
|
||||
.SelectMany(f => f.EnumerateFiles("*", SearchOption.AllDirectories))
|
||||
.Where( f => !f.Attributes.HasFlag( FileAttributes.Hidden ) )
|
||||
.Select(f => new FullPath(f))
|
||||
.Where(f => !modFiles.Contains(f))
|
||||
.ToList();
|
||||
|
|
|
|||
|
|
@ -771,9 +771,10 @@ public class ItemSwapTab : IDisposable, ITab
|
|||
|
||||
private void OnModOptionChange(ModOptionChangeType type, Mod mod, int a, int b, int c)
|
||||
{
|
||||
if (type is ModOptionChangeType.PrepareChange || mod != _mod)
|
||||
if (type is ModOptionChangeType.PrepareChange or ModOptionChangeType.GroupAdded or ModOptionChangeType.OptionAdded || mod != _mod)
|
||||
return;
|
||||
_swapData.LoadMod(_mod, _modSettings);
|
||||
_swapData.LoadMod(_mod, _modSettings);
|
||||
UpdateOption();
|
||||
_dirty = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue