diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-25 23:54:05 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-25 23:54:05 +0100 |
| commit | aff8646c47a567f48ed869ba2d444c99dded4d86 (patch) | |
| tree | ad461e23ee63cad3521d0319671c22fbabe1af51 /src/gui | |
| parent | e35b3bdd0a74464e4b4d3b931ca416f0c7864ba6 (diff) | |
| parent | 370f24a65a7aa6973db39e38a0994bfae0eb0f10 (diff) | |
| download | mana-aff8646c47a567f48ed869ba2d444c99dded4d86.tar.gz mana-aff8646c47a567f48ed869ba2d444c99dded4d86.tar.bz2 mana-aff8646c47a567f48ed869ba2d444c99dded4d86.tar.xz mana-aff8646c47a567f48ed869ba2d444c99dded4d86.zip | |
Merge branch '0.5'
Conflicts:
CMakeLists.txt
po/pt_BR.po
po/ru.po
src/winver.h
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/serverdialog.cpp | 2 |
1 files changed, 1 insertions, 1 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(); } |