Skip to content

Guard volume event node UI during editor teardown #1198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Guard volume event node UI during editor teardown #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af55b30
Initial plan
Copilot Apr 19, 2026
59cedfa
fix: guard volume event node ui teardown
Copilot Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions TombEditor/Controls/TriggerManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ obj is Editor.EventSetsChangedEvent ||
BeginInvoke((Action)(() =>
{
_nodeListRefreshPending = false;

if (IsDisposed || !IsHandleCreated || nodeEditor.IsDisposed)
return;

nodeEditor.PopulateCachedNodeLists(_editor.Level);
nodeEditor.RefreshArgumentUI();
}));
Expand Down
23 changes: 16 additions & 7 deletions TombLib/TombLib.Forms/Controls/VisualScripting/VisibleNodeBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,19 +162,25 @@ public void SelectFirstFunction(ArgumentType type, string luaName)

public void SpawnUIElements()
{
if (IsDisposed || Disposing || Node == null)
return;

var editor = Editor;
var func = cbFunction.SelectedItem as NodeFunction;

if (func == null)
if (func == null || editor == null || editor.IsDisposed)
return;

Visible = false;
Editor.LockNodeChanges = true;
editor.LockNodeChanges = true;
SuspendLayout();
DisposeUI();

var scale = 1.0f;
using (var gfx = FindForm().CreateGraphics())
scale = (float)gfx.DpiX / 96.0f;
var form = FindForm();
if (form != null && !form.IsDisposed)
using (var gfx = form.CreateGraphics())
scale = (float)gfx.DpiX / 96.0f;

Size = new Size((int)(Node.Size * scale), Size.Height);

Expand Down Expand Up @@ -279,10 +285,10 @@ public void SpawnUIElements()

RefreshLock();
ResumeLayout();
Editor.LockNodeChanges = false;
editor.LockNodeChanges = false;
Visible = true;
Invalidate();
Editor?.Invalidate();
editor.Invalidate();
}

private void Ctrl_LocatedItemFound(object sender, EventArgs e)
Expand Down Expand Up @@ -683,6 +689,9 @@ private void cbFunction_SelectedIndexChanged(object sender, EventArgs e)
return;

var funcSetup = cbFunction.SelectedItem as NodeFunction;
if (funcSetup == null || Node == null || IsDisposed || Disposing)
return;

Node.Function = funcSetup.Signature;

if ((_lastSelectedIndex != -1 && cbFunction.SelectedIndex != -1) || (funcSetup.Arguments.Count != Node.Arguments.Count))
Expand All @@ -700,4 +709,4 @@ private void cbFunction_MouseDown(object sender, MouseEventArgs e)
Ctrl_RightClick(sender, e);
}
}
}
}