Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5

2 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 409a0eda..fa068cda 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -344,6 +344,11 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
 
     if (isInventory)
     {
+        if (InventoryWindow::isStorageActive())
+        {
+            mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store")));
+        }
+
         if (item->isEquipment())
         {
             if (item->isEquipped())
@@ -363,11 +368,6 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
         {
             mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split")));
         }
-
-        if (InventoryWindow::isStorageActive())
-        {
-            mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store")));
-        }
     }
     // Assume in storage for now
     // TODO: make this whole system more flexible, if needed
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index abe898b0..6939d1e7 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -377,8 +377,8 @@ void ServerDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "remove")
     {
         int index = mServersList->getSelected();
-        mServersList->setSelected(0);
         mServers.erase(mServers.begin() + index);
+        mServersList->setSelected(0);
 
         saveCustomServers();
     }