Browse Source

git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@346 54d463be-8e91-2dee-dedb-b68131a5f0ec

mc_cameri 20 years ago
parent
commit
17ba37bf72
2 changed files with 6 additions and 2 deletions
  1. 3 0
      Changelog.txt
  2. 3 2
      src/char/char.c

+ 3 - 0
Changelog.txt

@@ -1,4 +1,7 @@
 Date	Added
+11/24
+	* Fixed char-txt crashing when closing, Codemaster free()'s. [MC Cameri]
+
 11/23
 	* Fixed script loading small/large monsters. [Valaris]
 	* @charoption is now #option [MC Cameri]

+ 3 - 2
src/char/char.c

@@ -3315,12 +3315,13 @@ int flush_timer(int tid, unsigned int tick, int id, int data){
 
 void do_final(void) {
 	int i;
-
+	printf("Terminating server.\n");
 	// write online players files with no player
 	for(i = 0; i < online_players_max; i++) {
 		online_chars[i].char_id = -1;
 		online_chars[i].server = -1;
 	}
+
 	create_online_files();
 	if(online_chars) free(online_chars);
 
@@ -3334,7 +3335,7 @@ void do_final(void) {
 	delete_session(char_fd);
 
 	for(i = 0; i < fd_max; i++)
-		if(session[i]->session_data) free(session[i]->session_data);
+		if(session[i] != NULL) free(session[i]);
 
 	char_log("----End of char-server (normal end with closing of all files)." RETCODE);
 }