From f19980be3abfc418dfc1f1411e3a9fc161620afa Mon Sep 17 00:00:00 2001 From: David Athay Date: Thu, 3 Apr 2008 15:12:30 +0000 Subject: Added patch from postalworker bug id=117 to fix cancel connecting to a sick server. --- src/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') 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: -- cgit v1.2.3-70-g09d2