summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlue Sans Douze <bluesansdouze@gmail.com>2011-03-26 17:01:07 +0100
committerBlue Sans Douze <bluesansdouze@gmail.com>2011-03-26 17:01:07 +0100
commit8279335d17b312a74492244cc4da3f212410ebd5 (patch)
tree4675ae1255adbdbc7784867bd6350aba73daf0d2 /src
parentc176ecada07af6235d6b65b839018e4e0bf07298 (diff)
parentaff8646c47a567f48ed869ba2d444c99dded4d86 (diff)
downloadmana-8279335d17b312a74492244cc4da3f212410ebd5.tar.gz
mana-8279335d17b312a74492244cc4da3f212410ebd5.tar.bz2
mana-8279335d17b312a74492244cc4da3f212410ebd5.tar.xz
mana-8279335d17b312a74492244cc4da3f212410ebd5.zip
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src')
-rw-r--r--src/gui/serverdialog.cpp2
-rw-r--r--src/main.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index cd09a50e..d68e2eca 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -367,8 +367,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();
}
diff --git a/src/main.h b/src/main.h
index 38ab6337..3a644100 100644
--- a/src/main.h
+++ b/src/main.h
@@ -55,7 +55,7 @@
#elif defined WIN32
#include "winver.h"
#elif defined __APPLE__
-#define PACKAGE_VERSION "0.5.0"
+#define PACKAGE_VERSION "0.5.1"
#endif
#ifdef PACKAGE_VERSION