summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-05 15:34:58 +0000
committermc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-05 15:34:58 +0000
commit804644fc009146a302af05848ec3ef3390a3dbcc (patch)
treed03ce2a4e321a15fa1cd948e380160652c2cf9d6
parentfdb354ff2dc7d5f59e6dc4a32d76c72315798200 (diff)
downloadhercules-804644fc009146a302af05848ec3ef3390a3dbcc.tar.gz
hercules-804644fc009146a302af05848ec3ef3390a3dbcc.tar.bz2
hercules-804644fc009146a302af05848ec3ef3390a3dbcc.tar.xz
hercules-804644fc009146a302af05848ec3ef3390a3dbcc.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@467 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt1
-rw-r--r--Dev/bugs.txt4
-rw-r--r--src/login/login.c6
3 files changed, 7 insertions, 4 deletions
diff --git a/Changelog.txt b/Changelog.txt
index de597e245..4d5283f39 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
Date Added
12/5
+ * Fixed bug in which login-txt was crashing in do_final() due to some free's [MC Cameri]
* Added nullpo's to all atcommand's functions, phew... [MC Cameri]
Note: I point out that MouseJstr has added some @commands that start with char which
havent been finished, they are just there but don't do anything.
diff --git a/Dev/bugs.txt b/Dev/bugs.txt
index fae4fc00a..8a15c816d 100644
--- a/Dev/bugs.txt
+++ b/Dev/bugs.txt
@@ -71,8 +71,8 @@ Assigned: N/A
Progress: 0%
Problem: Login-Txt is now crashing when you close it using ^C, Ctrl+C(on windows), it only does that if login was connected with char-server.
-Assigned: N/A
-Progress: 0
+Assigned: MC Cameri
+Progress: 100%
Problem: Storm Gust doesn't freeze mobs / players
Assigned: N/A
diff --git a/src/login/login.c b/src/login/login.c
index e55e9e3c5..08f91768b 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -3867,7 +3867,8 @@ int flush_timer(int tid, unsigned int tick, int id, int data){
//--------------------------------------
void do_final(void) {
int i, fd;
-
+ printf("Terminating...\n");
+ fflush(stdout);
mmo_auth_sync();
if(auth_dat) free(auth_dat);
@@ -3881,7 +3882,7 @@ void do_final(void) {
memset(&server[i], 0, sizeof(struct mmo_char_server));
close(fd);
delete_session(fd);
- if(session[fd]->session_data) free(session[fd]->session_data);
+ if(session[fd]) free(session[fd]);
}
}
close(login_fd);
@@ -3891,6 +3892,7 @@ void do_final(void) {
if(log_fp)
fclose(log_fp);
+ printf("Finished.\n");
}
//------------------------------