- Fixed crash when using Adaptation during an Encore.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8627 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 6 insertions, 5 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d9c71dc90..3a4810cac 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/09/04

+	* Fixed crash when using Adaptation during an Encore. [Skotlex]

 	* Should have fixed manner being reset to 0 on logout while muted.

 	  [Skotlex]

 	* Removed status_get_sc_tick, duration and chance are now both handled by

diff --git a/src/map/skill.c b/src/map/skill.c
index 8853dffbf..acbd081c4 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -9544,16 +9544,16 @@ void skill_stop_dancing (struct block_list *src)
 			dsd = map_id2sd(sc->data[SC_DANCING].val4);
 		sc->data[SC_DANCING].val4 = 0;
 	}
+	status_change_end(src, SC_DANCING, -1);
 
-	if (group)
-		skill_delunitgroup(NULL, group, 0);
-		
 	if (dsd)
 	{
 		dsd->sc.data[SC_DANCING].val4 = dsd->sc.data[SC_DANCING].val2 = 0;
 		status_change_end(&dsd->bl, SC_DANCING, -1);
 	}
-	status_change_end(src, SC_DANCING, -1);
+
+	if (group)
+		skill_delunitgroup(NULL, group, 0);
 }
 
 /*==========================================
@@ -9789,7 +9789,7 @@ int skill_delunitgroup (struct block_list *src, struct skill_unit_group *group,
 		group->valstr=NULL;
 	}
 
-	map_freeblock((struct block_list*)group->unit);
+	map_freeblock(&group->unit->bl);
 	group->unit=NULL;
 	group->group_id=0;
 	group->unit_count=0;