Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 9 insertions, 3 deletions

diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp
index 48eed92bc..79f895490 100644
--- a/src/dropshortcut.cpp
+++ b/src/dropshortcut.cpp
@@ -150,6 +150,10 @@ void DropShortcut::dropItems(int cnt)
 
 bool DropShortcut::dropItem(int cnt)
 {
+    const Inventory *inv = PlayerInfo::getInventory();
+    if (!inv)
+        return false;
+
     int itemId = 0;
     unsigned char itemColor = 1;
     while (mLastDropIndex < DROP_SHORTCUT_ITEMS && itemId < 1)
@@ -160,7 +164,7 @@ bool DropShortcut::dropItem(int cnt)
     }
     if (itemId > 0)
     {
-        Item *item = PlayerInfo::getInventory()->findItem(itemId, itemColor);
+        Item *item = inv->findItem(itemId, itemColor);
         if (item && item->getQuantity() > 0)
         {
             Net::getInventoryHandler()->dropItem(item, cnt);
@@ -180,8 +184,7 @@ bool DropShortcut::dropItem(int cnt)
         }
         if (itemId > 0)
         {
-            Item *item = PlayerInfo::getInventory()->findItem(
-                itemId, itemColor);
+            Item *item = inv->findItem(itemId, itemColor);
             if (item && item->getQuantity() > 0)
             {
                 Net::getInventoryHandler()->dropItem(item, cnt);
@@ -210,6 +213,9 @@ void DropShortcut::setItemSelected(Item *item)
 
 void DropShortcut::setItem(int index)
 {
+    if (index < 0 || index >= DROP_SHORTCUT_ITEMS)
+        return;
+
     mItems[index] = mItemSelected;
     mItemColors[index] = mItemColorSelected;
     save();