diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-10-01 08:59:27 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-10-01 08:59:27 -0600 |
commit | 83fd36204202b4b5cca7e6cdb37c025919f32f08 (patch) | |
tree | 36b9313af5e28a78aa3b953da3fd4d1387c4cffa /src/main.cpp | |
parent | cf46ad44ec6b804f1405f080a9d9fc106cab10dc (diff) | |
download | mana-83fd36204202b4b5cca7e6cdb37c025919f32f08.tar.gz mana-83fd36204202b4b5cca7e6cdb37c025919f32f08.tar.bz2 mana-83fd36204202b4b5cca7e6cdb37c025919f32f08.tar.xz mana-83fd36204202b4b5cca7e6cdb37c025919f32f08.zip |
Fix segfault better
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 5 |
1 files 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; |