Merge branch '1.0'

Conflicts:
	src/actorspritemanager.h
	src/beingmanager.cpp
	src/game.cpp
	src/gui/beingpopup.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/inventorywindow.h
	src/gui/itempopup.cpp
	src/gui/socialwindow.cpp
	src/gui/statuswindow.cpp
	src/gui/widgets/chattab.cpp
	src/gui/widgets/chattab.h
	src/net/tmwa/inventoryhandler.cpp
	src/net/tmwa/partyhandler.cpp
	src/party.cpp
	src/sound.cpp
	src/utils/stringutils.cpp
	src/utils/stringutils.h

1 files changed, 8 insertions, 1 deletions

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 6ad1b05f..62b63f24 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -312,11 +312,19 @@ void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
                                      (item->getQuantity() - 1));
     }
 
+    updateButtons();
+}
+
+void InventoryWindow::updateButtons()
+{
+    Item *item = mItems->getSelectedItem();
+
     if (!item || item->getQuantity() == 0)
     {
         mUseButton->setEnabled(false);
         mEquipButton->setEnabled(false);
         mDropButton->setEnabled(false);
+        mSplitButton->setEnabled(false);
 
         return;
     }
@@ -347,7 +355,6 @@ void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
         mSplitButton->setEnabled(false);
 }
 
-
 void InventoryWindow::setSplitAllowed(bool allowed)
 {
     mSplitButton->setVisible(allowed);