Fix crash when restoring state

- when restoring state, the old dock widgets would remove themselves
from their old dock areas and add themselves to the new dock areas. The
old dock areas that are empty would then delete themselves.
- That is a problem when the old overlay dock container would still try to
access the old dock areas, not knowing their deleted, causing a crash.

src/DockContainerWidget.cpp

@@ -1666,6 +1666,7 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
         CDockWidget::emitTopLevelEventForWidget(TopLevelWidget, true);
         dumpLayout();
         d->emitDockAreasRemoved();
+		area->overlayDockContainer()->clearDockArea();
         area->setOverlayDockContainer(nullptr);
 		area->updateAutoHideButtonCheckState();
         area->updateTitleBarButtonToolTip();

src/OverlayDockContainer.cpp

@@ -158,6 +158,11 @@ COverlayDockContainer::COverlayDockContainer(CDockManager* DockManager, CDockWid
 //============================================================================
 void COverlayDockContainer::updateMask()
 {
+	if (d->DockArea == nullptr)
+	{
+		return;
+	}
+
     const auto rect = d->DockArea->frameGeometry();
     const auto topLeft = rect.topLeft();
     const auto handleSize = d->Splitter->handleWidth();
@@ -222,6 +227,8 @@ CDockWidget* COverlayDockContainer::dockWidget() const
 //============================================================================
 void COverlayDockContainer::addDockWidget(CDockWidget* DockWidget)
 {
+    Q_ASSERT_X(d->DockArea != nullptr, "COverlayDockContainer::addDockWidget", "You should not be using the overlay dock container after the dock area is set to nullptr.");
+
 	if (d->DockWidget)
 	{
 		// Remove the old dock widget at this area
@@ -384,14 +391,26 @@ void COverlayDockContainer::collapseView(bool Enable)
 	if (Enable)
 	{
 		hide();
-		d->DockArea->hide();
+		if (d->DockArea)
-		d->DockWidget->hide();
+		{
+            d->DockArea->hide();
+		}
+		if (d->DockWidget)
+		{
+            d->DockWidget->hide();
+		}
 	}
 	else
 	{
 		show();
-		d->DockArea->show();
+        if (d->DockArea)
-		d->DockWidget->show();
+        {
+            d->DockArea->show();
+        }
+		if (d->DockWidget)
+		{
+            d->DockWidget->show();
+		}
 	}
 }
 
@@ -419,6 +438,13 @@ bool COverlayDockContainer::areaExistsInConfig(CDockWidgetSideTab::SideTabBarAre
 }
 
 
+//============================================================================
+void COverlayDockContainer::clearDockArea()
+{
+	d->DockArea = nullptr;
+}
+
+
 //============================================================================
 bool COverlayDockContainer::eventFilter(QObject* watched, QEvent* event)
 {

src/OverlayDockContainer.h

@@ -150,6 +150,12 @@ public:
 	 * Convenience function fr determining if area exists in config
 	 */
 	static bool areaExistsInConfig(CDockWidgetSideTab::SideTabBarArea area);
+
+	/**
+	 * Sets internal DockArea to nullptr
+	 * Called when removing the dock area from this overlay widget
+	 */
+	void clearDockArea();
 };
 }