From 64f6ddf1e2171dd7713f454c792916257e770f98 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 1 Jul 2014 14:47:49 +0200
Subject: Fix server-crash with non-existing items.

---
 src/UI/Window.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/UI')

diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index 98a9a0cec..af3e3e45c 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -170,7 +170,13 @@ void cWindow::Clicked(
 	const cItem & a_ClickedItem
 )
 {
-    	cPluginManager * PlgMgr = cRoot::Get()->GetPluginManager();
+	if (!IsValidItem(a_ClickedItem.m_ItemType) && !IsValidBlock(a_ClickedItem.m_ItemType))
+	{
+		LOGWARNING("%s: Player \"%s\" clicked to a non-existing item; ignoring click.", __FUNCTION__, a_Player.GetName().c_str());
+		return;
+	}
+
+	cPluginManager * PlgMgr = cRoot::Get()->GetPluginManager();
 	if (a_WindowID != m_WindowID)
 	{
 		LOGWARNING("%s: Wrong window ID (exp %d, got %d) received from \"%s\"; ignoring click.", __FUNCTION__, m_WindowID, a_WindowID, a_Player.GetName().c_str());
-- 
cgit v1.2.3