diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-04 13:47:31 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-04 13:47:31 +0200 |
| commit | 4aed49a70fe2e4fa3600b31525766c52bff52e3d (patch) | |
| tree | d17c4a960f4fea8c4020c0b5b6eba1d951fe25da /source/UI/Window.cpp | |
| parent | Fixed CreateHexDump() filling the string with garbage (diff) | |
| download | cuberite-4aed49a70fe2e4fa3600b31525766c52bff52e3d.tar cuberite-4aed49a70fe2e4fa3600b31525766c52bff52e3d.tar.gz cuberite-4aed49a70fe2e4fa3600b31525766c52bff52e3d.tar.bz2 cuberite-4aed49a70fe2e4fa3600b31525766c52bff52e3d.tar.lz cuberite-4aed49a70fe2e4fa3600b31525766c52bff52e3d.tar.xz cuberite-4aed49a70fe2e4fa3600b31525766c52bff52e3d.tar.zst cuberite-4aed49a70fe2e4fa3600b31525766c52bff52e3d.zip | |
Diffstat (limited to 'source/UI/Window.cpp')
| -rw-r--r-- | source/UI/Window.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp index d22255105..12c3e7350 100644 --- a/source/UI/Window.cpp +++ b/source/UI/Window.cpp @@ -165,8 +165,6 @@ void cWindow::OpenedByPlayer(cPlayer & a_Player) void cWindow::ClosedByPlayer(cPlayer & a_Player) { - ASSERT(m_WindowType != Inventory); // Inventory windows must not be closed (the client would repeat the close packet, looping forever) - // Checks whether the player is still holding an item if (a_Player.IsDraggingItem()) { @@ -177,7 +175,7 @@ void cWindow::ClosedByPlayer(cPlayer & a_Player) cClientHandle * ClientHandle = a_Player.GetClientHandle(); if (ClientHandle != NULL) { - ClientHandle->SendWindowClose(m_WindowID); + ClientHandle->SendWindowClose(*this); } { @@ -189,7 +187,8 @@ void cWindow::ClosedByPlayer(cPlayer & a_Player) } // for itr - m_SlotAreas[] m_OpenedBy.remove(&a_Player); - if (m_OpenedBy.empty()) + + if ((m_WindowType != Inventory) && m_OpenedBy.empty()) { Destroy(); } |