Update UIWindow.cpp

OGSR · Feb 9, 2019 · 2dcae9e · 2dcae9e
1 parent 62b4b62
commit 2dcae9e
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/ogsr_engine/xrGame/ui/UIWindow.cpp b/ogsr_engine/xrGame/ui/UIWindow.cpp
@@ -256,12 +256,19 @@ void CUIWindow::DetachChild(CUIWindow* pChild, bool from_destructor)
 	if( GetMouseCapturer() == pChild )
 		SetMouseCapture(pChild, false);
 
-	try {
-		m_ChildWndList.remove(pChild);
-	}
-	catch(...)
+	auto it = std::find(m_ChildWndList.begin(), m_ChildWndList.end(), pChild);
+	if (it != m_ChildWndList.end())
 	{
-		ASSERT_FMT(std::find(m_ChildWndList.begin(), m_ChildWndList.end(), pChild) == m_ChildWndList.end(), "Can't remove pointer [%x] from m_ChildWndList", pChild);
+		// KRodin: я знаю, что этот костыль ужасен.
+		auto to_delete = new decltype(m_ChildWndList)();
+		to_delete->splice(to_delete->begin(), m_ChildWndList, it);
+		//ASSERT_FMT(std::find(m_ChildWndList.begin(), m_ChildWndList.end(), pChild) == m_ChildWndList.end(), "Can't remove pointer [%x] from m_ChildWndList", pChild);
+		//ASSERT_FMT(std::find(to_delete->begin(), to_delete->end(), pChild) != to_delete->end(), "Can't remove pointer [%x] from m_ChildWndList (2)", pChild);
+		//ASSERT_FMT(to_delete->size() == 1, "");
+		try {
+			delete to_delete;
+		}
+		catch (...) {}
 	}
 
 	pChild->SetParent(NULL);