ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-20 14:57:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: always run HandleRemoveNodes, even if DTR element doesn't exist

Browse source
This commit is contained in:
goat 2022-02-14 01:52:50 +01:00
parent 5cb693e834
commit 08b5739369
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Game/Gui/Dtr/DtrBar.cs
View file

@ -133,11 +133,11 @@ namespace Dalamud.Game.Gui.Dtr
private void Update(Framework unused) private void Update(Framework unused)
{ {
this.HandleRemovedNodes();
var dtr = GetDtr(); var dtr = GetDtr();
if (dtr == null) return; if (dtr == null) return;
this.HandleRemovedNodes();
// The collision node on the DTR element is always the width of its content // The collision node on the DTR element is always the width of its content
if (dtr->UldManager.NodeList == null) return; if (dtr->UldManager.NodeList == null) return;
@ -236,7 +236,7 @@ namespace Dalamud.Game.Gui.Dtr
private bool AddNode(AtkTextNode* node) private bool AddNode(AtkTextNode* node)
{ {
var dtr = GetDtr(); var dtr = GetDtr();
if (dtr == null || dtr->RootNode == null || node == null) return false; if (dtr == null || dtr->RootNode == null || dtr->UldManager.NodeList == null || node == null) return false;
var lastChild = dtr->RootNode->ChildNode; var lastChild = dtr->RootNode->ChildNode;
while (lastChild->PrevSiblingNode != null) lastChild = lastChild->PrevSiblingNode; while (lastChild->PrevSiblingNode != null) lastChild = lastChild->PrevSiblingNode;
@ -256,7 +256,7 @@ namespace Dalamud.Game.Gui.Dtr
private bool RemoveNode(AtkTextNode* node) private bool RemoveNode(AtkTextNode* node)
{ {
var dtr = GetDtr(); var dtr = GetDtr();
if (dtr == null || dtr->RootNode == null || node == null) return false; if (dtr == null || dtr->RootNode == null || dtr->UldManager.NodeList == null || node == null) return false;
var tmpPrevNode = node->AtkResNode.PrevSiblingNode; var tmpPrevNode = node->AtkResNode.PrevSiblingNode;
var tmpNextNode = node->AtkResNode.NextSiblingNode; var tmpNextNode = node->AtkResNode.NextSiblingNode;