summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-05-05 13:03:45 -0600
committerJared Adams <jaxad0127@gmail.com>2010-05-05 13:24:12 -0600
commited4c141a666ffa8221da2a8143d51189d12cd60c (patch)
tree377bf6e6a564a546da7b03f15fa17696e5ee24e3 /src
parentafc816e3001104653982de25099fcc634d7ed686 (diff)
downloadmana-ed4c141a666ffa8221da2a8143d51189d12cd60c.tar.gz
mana-ed4c141a666ffa8221da2a8143d51189d12cd60c.tar.bz2
mana-ed4c141a666ffa8221da2a8143d51189d12cd60c.tar.xz
mana-ed4c141a666ffa8221da2a8143d51189d12cd60c.zip
Fix showing the type of the default server
Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp2
-rw-r--r--src/gui/serverdialog.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 8d916add..b27caadc 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -397,7 +397,7 @@ Client::Client(const Options &options):
mCurrentServer.port = (short) branding.getValue("defaultPort",
DEFAULT_PORT);
mCurrentServer.type = ServerInfo::parseType(
- branding.getValue("defaultServerType", "eathena"));
+ branding.getValue("defaultServerType", "tmwathena"));
}
if (loginData.username.empty() && loginData.remember)
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 0fba5638..c79925b3 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -219,6 +219,8 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
mTypeListModel = new TypeListModel();
mTypeField = new DropDown(mTypeListModel);
+ mTypeField->setSelected((serverInfo->type == ServerInfo::MANASERV) ?
+ 1 : 0);
mDescription = new Label(std::string());