Fixed memory leak

githubuser0xFFFF · githubuser0xFFFF · commit 543d226ba3b0 · 2020-08-24T13:32:50.000+02:00
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
@@ -131,8 +131,6 @@ class CDockAreaLayout
 			{
 				LayoutItem->widget()->setParent(nullptr);
 			}
-			delete LayoutItem;
-
 			m_CurrentWidget = nullptr;
 			m_CurrentIndex = -1;
 		}
@@ -172,7 +170,12 @@ class CDockAreaLayout
 			parent->setUpdatesEnabled(false);
 		}
 
-		delete m_ParentLayout->takeAt(1);
+		auto LayoutItem = m_ParentLayout->takeAt(1);
+		if (LayoutItem)
+		{
+			LayoutItem->widget()->setParent(nullptr);
+		}
+		delete LayoutItem;
 
 		m_ParentLayout->addWidget(next);
 		if (prev)

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,6 @@ class CDockAreaLayout`
`131`	`131`	`{`
`132`	`132`	`LayoutItem->widget()->setParent(nullptr);`
`133`	`133`	`}`
`134`		`- delete LayoutItem;`
`135`		`-`
`136`	`134`	`m_CurrentWidget = nullptr;`
`137`	`135`	`m_CurrentIndex = -1;`
`138`	`136`	`}`
`@@ -172,7 +170,12 @@ class CDockAreaLayout`
`172`	`170`	`parent->setUpdatesEnabled(false);`
`173`	`171`	`}`
`174`	`172`
`175`		`- delete m_ParentLayout->takeAt(1);`
	`173`	`+ auto LayoutItem = m_ParentLayout->takeAt(1);`
	`174`	`+ if (LayoutItem)`
	`175`	`+ {`
	`176`	`+ LayoutItem->widget()->setParent(nullptr);`
	`177`	`+ }`
	`178`	`+ delete LayoutItem;`
`176`	`179`
`177`	`180`	`m_ParentLayout->addWidget(next);`
`178`	`181`	`if (prev)`