dave/Tarkov-UIFixes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug tweak; extra null check on EventSystem.current

Browse Source
This commit is contained in:
Tyfon
2024-06-22 03:31:31 -07:00
parent 376999a472
commit ab23705cdb
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MultiSelectDebug.cs
View File

@@ -36,8 +36,7 @@ namespace UIFixes
foreach (ItemContextClass itemContext in MultiSelect.ItemContexts) foreach (ItemContextClass itemContext in MultiSelect.ItemContexts)
{ {
builder.AppendFormat("x{0} {1}", itemContext.Item.StackObjectsCount, itemContext.Item.ToString()); builder.AppendFormat("x{0} {1}\n", itemContext.Item.StackObjectsCount, itemContext.Item.ToString());
builder.AppendLine();
} }
if (MultiSelect.SecondaryContexts.Any()) if (MultiSelect.SecondaryContexts.Any())
@@ -45,8 +44,7 @@ namespace UIFixes
builder.AppendFormat("Secondary Items: <color=yellow>{0}</color>\n", MultiSelect.SecondaryCount); builder.AppendFormat("Secondary Items: <color=yellow>{0}</color>\n", MultiSelect.SecondaryCount);
foreach (ItemContextClass itemContext in MultiSelect.SecondaryContexts) foreach (ItemContextClass itemContext in MultiSelect.SecondaryContexts)
{ {
builder.Append(itemContext.Item.ToString()); builder.AppendFormat("x{0} {1}\n", itemContext.Item.StackObjectsCount, itemContext.Item.ToString());
builder.AppendLine();
} }
} }

2
Patches/ContextMenuShortcutPatches.cs
View File

@@ -29,7 +29,7 @@ namespace UIFixes
{ {
// Need an item context to operate on, and ignore these keypresses if there's a focused textbox somewhere // Need an item context to operate on, and ignore these keypresses if there's a focused textbox somewhere
ItemContextAbstractClass itemContext = __instance.R().ItemContext; ItemContextAbstractClass itemContext = __instance.R().ItemContext;
if (itemContext == null || EventSystem.current.currentSelectedGameObject?.GetComponent<TMP_InputField>() != null) if (itemContext == null || EventSystem.current?.currentSelectedGameObject?.GetComponent<TMP_InputField>() != null)
{ {
return; return;
} }