summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-03-25 23:54:05 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-03-25 23:54:05 +0100
commitaff8646c47a567f48ed869ba2d444c99dded4d86 (patch)
treead461e23ee63cad3521d0319671c22fbabe1af51 /src
parente35b3bdd0a74464e4b4d3b931ca416f0c7864ba6 (diff)
parent370f24a65a7aa6973db39e38a0994bfae0eb0f10 (diff)
downloadmana-client-aff8646c47a567f48ed869ba2d444c99dded4d86.tar.gz
mana-client-aff8646c47a567f48ed869ba2d444c99dded4d86.tar.bz2
mana-client-aff8646c47a567f48ed869ba2d444c99dded4d86.tar.xz
mana-client-aff8646c47a567f48ed869ba2d444c99dded4d86.zip
Merge branch '0.5'
Conflicts: CMakeLists.txt po/pt_BR.po po/ru.po src/winver.h
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