From 6976de31af4fd2d1813daece04f44213c1d74799 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 17 May 2020 06:44:23 -0700 Subject: [PATCH] Fixed issues closing tabs --- BeefLibs/Beefy2D/src/widgets/DockingFrame.bf | 4 ++++ IDE/src/IDEApp.bf | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/BeefLibs/Beefy2D/src/widgets/DockingFrame.bf b/BeefLibs/Beefy2D/src/widgets/DockingFrame.bf index cc024ef3..54b05b72 100644 --- a/BeefLibs/Beefy2D/src/widgets/DockingFrame.bf +++ b/BeefLibs/Beefy2D/src/widgets/DockingFrame.bf @@ -235,7 +235,11 @@ namespace Beefy.widgets public void Simplify() { if ((mDockedWidgets.Count == 0) && (mParentDockingFrame != null)) + { mParentDockingFrame.RemoveWidget(this); + mParentDockingFrame.mDockedWidgets.Remove(this); + BFApp.sApp.DeferDelete(this); + } else if ((mDockedWidgets.Count == 1) && (mParentDockingFrame != null)) { // Just a single object, remove ourselves from the frame diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf index e1657c4d..abe67abf 100644 --- a/IDE/src/IDEApp.bf +++ b/IDE/src/IDEApp.bf @@ -6165,7 +6165,6 @@ namespace IDE } }); - Debug.Assert(tabbedView != null); if (tabbedView == null) return;