From 83fd36204202b4b5cca7e6cdb37c025919f32f08 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 1 Oct 2009 08:59:27 -0600 Subject: Fix segfault better --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index d491d9b5..4699e072 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -908,8 +908,9 @@ int main(int argc, char *argv[]) state = STATE_GAME; } - else if (state == STATE_CONNECT_SERVER && (Net::getLoginHandler() && - Net::getLoginHandler()->isConnected())) + else if (state == STATE_CONNECT_SERVER && + oldstate != STATE_CHOOSE_SERVER && + Net::getLoginHandler()->isConnected()) { Net::getCharHandler()->setCharInfo(&charInfo); state = STATE_LOGIN; -- cgit v1.2.3-70-g09d2