diff options
| author | David Athay <ko2fan@gmail.com> | 2008-04-03 15:12:30 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-04-03 15:12:30 +0000 |
| commit | f19980be3abfc418dfc1f1411e3a9fc161620afa (patch) | |
| tree | 0c4e7c0659a062ce8b77ff67de4f53eb775fc689 /src/main.cpp | |
| parent | ebaefeb62f81a63a12a888459daee3eaf5bb4e36 (diff) | |
| download | mana-f19980be3abfc418dfc1f1411e3a9fc161620afa.tar.gz mana-f19980be3abfc418dfc1f1411e3a9fc161620afa.tar.bz2 mana-f19980be3abfc418dfc1f1411e3a9fc161620afa.tar.xz mana-f19980be3abfc418dfc1f1411e3a9fc161620afa.zip | |
Added patch from
postalworker bug id=117 to fix cancel connecting to a sick server.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 7d550571..92b55928 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -881,7 +881,7 @@ int main(int argc, char *argv[]) logger->log("Trying to connect to account server..."); accountServerConnection->connect(loginData.hostname, loginData.port); - currentDialog = new ConnectionDialog(STATE_CHOOSE_SERVER); + currentDialog = new ConnectionDialog(STATE_SWITCH_ACCOUNTSERVER_ATTEMPT); break; case STATE_UPDATE: @@ -933,6 +933,8 @@ int main(int argc, char *argv[]) case STATE_SWITCH_ACCOUNTSERVER_ATTEMPT: logger->log("State: SWITCH_ACCOUNTSERVER_ATTEMPT"); switchAccountServer(); + + state = STATE_SWITCH_ACCOUNTSERVER; break; case STATE_REGISTER: @@ -994,7 +996,7 @@ int main(int argc, char *argv[]) case STATE_CONNECT_GAME: logger->log("State: CONNECT_GAME"); - currentDialog = new ConnectionDialog(STATE_CHAR_SELECT); + currentDialog = new ConnectionDialog(STATE_SWITCH_ACCOUNTSERVER_ATTEMPT); break; case STATE_GAME: |