diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/client.cpp | 7 |
2 files changed, 2 insertions, 6 deletions
@@ -46,6 +46,7 @@ - Fixed item links with empty item name to look up name from Item DB - Fixed spaces getting added to chat every 50 characters - Fixed empty Equipment window on freshly created character +- Fixed choosing default world when using -D command-line parameter - Updated to tmwAthena protocol changes - Updated to Manaserv protocol changes (specials, guilds, debug mode, skills, text particles) - CMake: Use GNUInstallDirs and made PKG_DATADIR / PKG_BINDIR paths modifiable diff --git a/src/client.cpp b/src/client.cpp index 6fe64b2a..05e3af01 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -681,7 +681,7 @@ int Client::exec() // Trust that the netcode knows what it's doing mState = STATE_UPDATE; } - else if (worlds.size() == 1) + else if (worlds.size() == 1 || mOptions.chooseDefault) { Net::getLoginHandler()->chooseServer(0); mState = STATE_UPDATE; @@ -689,11 +689,6 @@ int Client::exec() else { mCurrentDialog = new WorldSelectDialog(std::move(worlds)); - if (mOptions.chooseDefault) - { - ((WorldSelectDialog*) mCurrentDialog)->action( - gcn::ActionEvent(nullptr, "ok")); - } } } break; |