anna/XivCommon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: don't crash on no addon

Browse Source
This commit is contained in:
Anna 2021-04-27 00:31:42 -04:00
parent 8b76375352
commit 8b8ce84ec4
Signed by: anna
GPG Key ID: 0B391D8F06FCD9E0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XivCommon/Functions/ContextMenu.cs
View File

@ -112,8 +112,12 @@ namespace XivCommon.Functions {
return this.Functions.GetAgentByInternalId(9);
}
private unsafe string GetParentAddonName(IntPtr addon) {
private unsafe string? GetParentAddonName(IntPtr addon) {
var parentAddonId = Marshal.ReadInt16(addon + ParentAddonIdOffset);
if (parentAddonId == 0) {
return null;
}
var stage = (AtkStage*) this.Functions.GetAtkStageSingleton();
var parentAddon = this._getAddonByInternalId((IntPtr) stage->RaptureAtkUnitManager, parentAddonId);
return Encoding.UTF8.GetString(Util.ReadTerminated(parentAddon + 8));
@ -123,6 +127,9 @@ namespace XivCommon.Functions {
this.NormalSize = menuSize - 7;
var addonName = this.GetParentAddonName(addon);
if (addonName == null) {
goto Original;
}
var agent = this.GetContextMenuAgent();
@ -161,6 +168,9 @@ namespace XivCommon.Functions {
private byte ItemSelectedDetour(IntPtr addon, int index, byte a3) {
var addonName = this.GetParentAddonName(addon);
if (addonName == null) {
goto Original;
}
// a custom item is being clicked
if (index >= this.NormalSize) {