ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 20:24:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix bug with default mod settings other than 0.

Browse source
This commit is contained in:
Ottermandias 2023-03-25 12:53:47 +01:00
parent fb2fe05409
commit d58a3e0fe7
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Penumbra/Collections/ModCollection.Changes.cs
View file

@ -93,16 +93,15 @@ public partial class ModCollection
public bool SetModSetting( int idx, int groupIdx, uint newValue ) public bool SetModSetting( int idx, int groupIdx, uint newValue )
{ {
var settings = _settings[ idx ] != null ? _settings[ idx ]!.Settings : this[ idx ].Settings?.Settings; var settings = _settings[ idx ] != null ? _settings[ idx ]!.Settings : this[ idx ].Settings?.Settings;
var oldValue = settings?[ groupIdx ] ?? 0; var oldValue = settings?[ groupIdx ] ?? Penumbra.ModManager[idx].Groups[groupIdx].DefaultSettings;
if( oldValue != newValue ) if (oldValue == newValue)
{ return false;
var inheritance = FixInheritance( idx, false ); var inheritance = FixInheritance( idx, false );
_settings[ idx ]!.SetValue( Penumbra.ModManager[ idx ], groupIdx, newValue ); _settings[ idx ]!.SetValue( Penumbra.ModManager[ idx ], groupIdx, newValue );
ModSettingChanged.Invoke( ModSettingChange.Setting, idx, inheritance ? -1 : ( int )oldValue, groupIdx, false ); ModSettingChanged.Invoke( ModSettingChange.Setting, idx, inheritance ? -1 : ( int )oldValue, groupIdx, false );
return true; return true;
}
return false;
} }
// Change one of the available mod settings for mod idx discerned by type. // Change one of the available mod settings for mod idx discerned by type.

6
Penumbra/UI/ModsTab/ModPanelSettingsTab.cs
View file

@ -122,12 +122,12 @@ public class ModPanelSettingsTab : ITab
private void DrawEnabledInput() private void DrawEnabledInput()
{ {
var enabled = _settings.Enabled; var enabled = _settings.Enabled;
if (ImGui.Checkbox("Enabled", ref enabled)) if (!ImGui.Checkbox("Enabled", ref enabled))
{ return;
_modManager.NewMods.Remove(_selector.Selected!); _modManager.NewMods.Remove(_selector.Selected!);
_collectionManager.Current.SetModState(_selector.Selected!.Index, enabled); _collectionManager.Current.SetModState(_selector.Selected!.Index, enabled);
} }
}
/// <summary> /// <summary>
/// Draw a priority input. /// Draw a priority input.