Fixed crash caused by changes related to issue #594 - deletion of CFloatingWidget caused crash when loading a state from XML

Author: githubuser0xFFFF

src/DockManager.cpp

@@ -566,6 +566,7 @@ CDockManager::~CDockManager()
 	auto FloatingWidgets = d->FloatingWidgets;
 	for (auto FloatingWidget : FloatingWidgets)
 	{
+		FloatingWidget->deleteContent();
 		delete FloatingWidget;
 	}
 

src/FloatingDockContainer.cpp

@@ -760,10 +760,22 @@ CFloatingDockContainer::CFloatingDockContainer(CDockWidget *DockWidget) :
     d->DockManager->notifyWidgetOrAreaRelocation(DockWidget);
 }
 
+
 //============================================================================
 CFloatingDockContainer::~CFloatingDockContainer()
 {
 	ADS_PRINT("~CFloatingDockContainer");
+	if (d->DockManager)
+	{
+		d->DockManager->removeFloatingWidget(this);
+	}
+	delete d;
+}
+
+
+//============================================================================
+void CFloatingDockContainer::deleteContent()
+{
 	std::vector<QPointer<ads::CDockAreaWidget>> areas;
 	for (int i = 0; i != dockContainer()->dockAreaCount(); ++i)
 	{
@@ -788,12 +800,6 @@ CFloatingDockContainer::~CFloatingDockContainer()
 			delete ptrWdg;
 		}
 	}
-
-	if (d->DockManager)
-	{
-		d->DockManager->removeFloatingWidget(this);
-	}
-	delete d;
 }
 
 //============================================================================

src/FloatingDockContainer.h

@@ -146,6 +146,13 @@ private Q_SLOTS:
 	 */
 	virtual void finishDragging() override;
 
+	/**
+	 * This function deletes all dock widgets in it.
+	 * This functions should be called only from dock manager in its
+	 * destructor before deleting the floating widget
+     */
+	void deleteContent();
+
 	/**
 	 * Call this function if you just want to initialize the position
 	 * and size of the floating widget