Fixed SIGSEGV with homunc save

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

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

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;
 		}
 	}