diff --git a/OtterGui b/OtterGui index 98edb3c7..d8522bb1 160000 --- a/OtterGui +++ b/OtterGui @@ -1 +1 @@ -Subproject commit 98edb3c7901f1017393c09c6e8b258895ae1c01e +Subproject commit d8522bb1d87cef54157ca2fb18d05c0c4fc4eeb2 diff --git a/Penumbra/Interop/Resolver/PathResolver.Identification.cs b/Penumbra/Interop/Resolver/PathResolver.Identification.cs index 7fe51b15..b88c4e88 100644 --- a/Penumbra/Interop/Resolver/PathResolver.Identification.cs +++ b/Penumbra/Interop/Resolver/PathResolver.Identification.cs @@ -18,7 +18,7 @@ namespace Penumbra.Interop.Resolver; public unsafe partial class PathResolver { [Signature( "0F B7 0D ?? ?? ?? ?? C7 85", ScanType = ScanType.StaticAddress )] - private static readonly ushort* InspectTitleId = null!; + private static ushort* _inspectTitleId = null!; // Obtain the name of the current player, if one exists. private static string? GetPlayerName() @@ -39,7 +39,7 @@ public unsafe partial class PathResolver } var ui = ( AtkUnitBase* )addon; - var nodeId = Dalamud.GameData.GetExcelSheet< Title >()?.GetRow( *InspectTitleId )?.IsPrefix == true ? 7u : 6u; + var nodeId = Dalamud.GameData.GetExcelSheet< Title >()?.GetRow( *_inspectTitleId )?.IsPrefix == true ? 7u : 6u; var text = ( AtkTextNode* )ui->UldManager.SearchNodeById( nodeId ); return text != null && text->AtkResNode.Type == NodeType.Text ? text->NodeText.ToString() : null; diff --git a/Penumbra/UI/ConfigWindow.Changelog.cs b/Penumbra/UI/ConfigWindow.Changelog.cs index db6cfec4..654f020b 100644 --- a/Penumbra/UI/ConfigWindow.Changelog.cs +++ b/Penumbra/UI/ConfigWindow.Changelog.cs @@ -26,6 +26,7 @@ public partial class ConfigWindow .RegisterEntry( "Files in the UI category will no longer be deduplicated for the moment." ) .RegisterHighlight( "If you experience UI-related crashes, please re-import your UI mods.", 1 ) .RegisterEntry( "This is a temporary fix against those not-yet fully understood crashes and may be reworked later.", 1 ) + .RegisterHighlight( "There is still a possibility of UI related mods crashing the game, we are still investigating - they behave very weirdly. If you continue to experience crashing, try disabling your UI mods.", 1 ) .RegisterEntry( "On import, Penumbra will now show files with extensions '.ttmp', '.ttmp2' and '.pmp'. You can still select showing generic archive files." ) .RegisterEntry( @@ -41,6 +42,7 @@ public partial class ConfigWindow .RegisterEntry( "Fixed assigned collections not working correctly on adventurer plates." ) .RegisterEntry( "Fixed a wrongly displayed folder line in some circumstances." ) .RegisterEntry( "Fixed crash after deleting mod options." ) + .RegisterEntry( "Fixed Inspect Window collections not working correctly." ) .RegisterEntry( "Made identically named options selectable in mod configuration. Do not name your options identically." ) .RegisterEntry( "Added some additional functionality for Mare Synchronos." ); } \ No newline at end of file