Merge branch '0.5'

Conflicts:
	CMakeLists.txt
	po/fi.po
	po/fr.po
	src/gui/skilldialog.cpp
	src/localplayer.cpp
	src/net/manaserv/generalhandler.cpp
	src/net/tmwa/buysellhandler.cpp
	src/net/tmwa/generalhandler.cpp
	src/net/tmwa/playerhandler.cpp
	src/net/tmwa/specialhandler.cpp
	src/winver.h

1 files changed, 1 insertions, 5 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 4a8dae17..8e9f13e8 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -208,11 +208,7 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         if (price < 0)
             price = 0;
         setMoney(mMoney - mAmountItems * price);
-
-        // Reset selection
-        mAmountItems = 1;
-        mSlider->setValue(1);
-        mSlider->gcn::Slider::setScale(1, mMaxItems);
+        valueChanged(gcn::SelectionEvent(mShopItemList));
     }
 }