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

Fixes problems with windows:

Browse Source 
- Changed cPlayer:OpenWindow to accept a ref, tolua adds a nil check
- Close open lua window in destructor, to avoid dangling pointers
This commit is contained in:
Lukas Pioch
2017-05-29 21:33:30 +02:00
parent 2b699dc749
commit 7922e6addb
15 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Entities/Player.cpp
View File

@@ -1310,15 +1310,15 @@ cTeam * cPlayer::UpdateTeam(void)
void cPlayer::OpenWindow(cWindow * a_Window)
void cPlayer::OpenWindow(cWindow & a_Window)
{
if (a_Window != m_CurrentWindow)
if (&a_Window != m_CurrentWindow)
{
CloseWindow(false);
}
a_Window->OpenedByPlayer(*this);
m_CurrentWindow = a_Window;
a_Window->SendWholeWindow(*GetClientHandle());
a_Window.OpenedByPlayer(*this);
m_CurrentWindow = &a_Window;
a_Window.SendWholeWindow(*GetClientHandle());
}