summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-10 23:53:16 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-10 23:53:16 +0000
commit58af0db03f21591ac753d7edad30fe1b494dc0ec (patch)
tree01cf15523d4972874ad99d74cc68b8c8da950f31
parentbd04c907de380951fee0588dc7c7482a2d2e19aa (diff)
downloadhercules-58af0db03f21591ac753d7edad30fe1b494dc0ec.tar.gz
hercules-58af0db03f21591ac753d7edad30fe1b494dc0ec.tar.bz2
hercules-58af0db03f21591ac753d7edad30fe1b494dc0ec.tar.xz
hercules-58af0db03f21591ac753d7edad30fe1b494dc0ec.zip
- Fixed check_connect_login_server check in char-sql server. Fixes char-server not reconnecting to the login server.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7605 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char_sql/char.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3d6e74c75..7be3420c6 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/10
+ * Fixed check_connect_login_server check in char-sql server. Fixes
+ char-server not reconnecting to the login server. [Skotlex]
* Login-sql server will no longer change an account's state to "7" when
banning a player. This should fix being able to use @ban to clear out a
@blocked player. Players will now be identified as banned only through the
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index c5d248f71..15da747e5 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -3768,7 +3768,7 @@ int send_accounts_tologin(int tid, unsigned int tick, int id, int data) {
}
int check_connect_login_server(int tid, unsigned int tick, int id, int data) {
- if (login_fd > 0 || session[login_fd] != NULL)
+ if (login_fd > 0 && session[login_fd] != NULL)
return 0;
ShowInfo("Attempt to connect to login-server...\n");