summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-10-01 08:43:26 -0600
committerJared Adams <jaxad0127@gmail.com>2009-10-01 08:43:26 -0600
commitcf46ad44ec6b804f1405f080a9d9fc106cab10dc (patch)
treef9d618d8bf246a16bc50f15f288d836d83bf8b86 /src/main.cpp
parent496e7021a8b8b4c1afb61168792a8d7f9bc38c6b (diff)
downloadmana-cf46ad44ec6b804f1405f080a9d9fc106cab10dc.tar.gz
mana-cf46ad44ec6b804f1405f080a9d9fc106cab10dc.tar.bz2
mana-cf46ad44ec6b804f1405f080a9d9fc106cab10dc.tar.xz
mana-cf46ad44ec6b804f1405f080a9d9fc106cab10dc.zip
Fix a segfault when choosing the server
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 3c83e6eb..d491d9b5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -908,8 +908,8 @@ int main(int argc, char *argv[])
state = STATE_GAME;
}
- else if (state == STATE_CONNECT_SERVER &&
- Net::getLoginHandler()->isConnected())
+ else if (state == STATE_CONNECT_SERVER && (Net::getLoginHandler() &&
+ Net::getLoginHandler()->isConnected()))
{
Net::getCharHandler()->setCharInfo(&charInfo);
state = STATE_LOGIN;