Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-29 09:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensures _latestClosedRunStateToplevel is cleanup on ResetState and support OverlappedTop.

Browse Source
This commit is contained in:
BDisp
2024-03-25 15:30:13 +00:00
parent 408ae43e74
commit 802b996ed1
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Terminal.Gui/Application.cs
View File

@@ -101,9 +101,16 @@ public static partial class Application
if (Top is { })
{
Debug.Assert (Top.WasDisposed);
// If End wasn't called _latestClosedRunStateToplevel may be null
if (_latestClosedRunStateToplevel is { })
{
Debug.Assert (_latestClosedRunStateToplevel.WasDisposed);
Debug.Assert (_latestClosedRunStateToplevel == Top);
}
}
#endif
Top = null;
_latestClosedRunStateToplevel = null;
// MainLoop stuff
MainLoop?.Dispose ();
@@ -1064,7 +1071,14 @@ public static partial class Application
// Don't dispose runState.Toplevel. It's up to caller dispose it
// If it's not the same as the current in the RunIteration,
// it will be fixed later in the next RunIteration.
_latestClosedRunStateToplevel = runState.Toplevel;
if (OverlappedTop is { } && !_topLevels.Contains (OverlappedTop))
{
_latestClosedRunStateToplevel = OverlappedTop;
}
else
{
_latestClosedRunStateToplevel = runState.Toplevel;
}
runState.Toplevel = null;
runState.Dispose ();
}