flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed LuaWindow destructor causing a crash.

Browse Source 
It was leaving the m_Contents' relations to listeners and SlotAreas' relations to m_Contents, which were already gone.
This commit is contained in:
madmaxoft 2013-08-18 00:39:15 +02:00
parent 5efbb46ff0
commit 8fe6bb55dd
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/LuaWindow.cpp
View File

@ -48,6 +48,16 @@ cLuaWindow::cLuaWindow(cWindow::WindowType a_WindowType, int a_SlotsX, int a_Slo
cLuaWindow::~cLuaWindow()
{
m_Contents.RemoveListener(*this);
// Must delete slot areas now, because they are referencing this->m_Contents and would try to access it in cWindow's
// destructor, when the member is already gone.
for (cSlotAreas::iterator itr = m_SlotAreas.begin(), end = m_SlotAreas.end(); itr != end; ++itr)
{
delete *itr;
}
m_SlotAreas.clear();
ASSERT(m_OpenedBy.empty());
}