Merge branch 'blr' into develop

2015-02-03 17:19:06 +00:00
parent e02ce560bf e9af90e4b6
commit 0083e62c41
10 changed files with 667 additions and 53 deletions
--- a/server/core/hashtable.c
+++ b/server/core/hashtable.c
@ -180,6 +180,7 @@ HASHENTRIES	*entry, *ptr;
 	}
 	free(table->entries);
 	
+	hashtable_write_unlock(table);
 	if (!table->ht_isflat)
 	{
 		free(table);