From 4ea2f6554e5d10287c6f00007103ab3ca4394d55 Mon Sep 17 00:00:00 2001 From: toms Date: Tue, 15 Aug 2006 12:02:00 +0000 Subject: Fixed SIGSEGV with homunc save git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8288 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/unit.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 03e2d5923..7f7382036 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2006/08/15 + * Fixed SIGSEGV with homunc save [Toms] 2006/08/14 * Removed support for negative autosave intervals, instead added a minsave_interval setting which specifies which is the minimum time between diff --git a/src/map/unit.c b/src/map/unit.c index 90095d13a..7d4af0dfb 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1784,8 +1784,6 @@ int unit_free(struct block_list *bl) { merc_hom_hungry_timer_delete(hd); merc_natural_heal_timer_delete(hd); if(sd) { - sd->hd = NULL; - hd->master = NULL; if (sd->homunculus.intimacy > 0) merc_save(hd); else @@ -1794,6 +1792,8 @@ int unit_free(struct block_list *bl) { sd->status.hom_id = 0; sd->homunculus.hom_id = 0; } + sd->hd = NULL; + hd->master = NULL; } } -- cgit v1.2.3-70-g09d2