ChunkStay must be disabled while being deleted.

madmaxoft · madmaxoft · commit 34cf058b0257 · 2014-04-12T22:35:04.000+02:00
Fixes #758.
diff --git a/src/ChunkStay.cpp b/src/ChunkStay.cpp
@@ -31,10 +31,7 @@ cChunkStay::~cChunkStay()
 
 void cChunkStay::Clear(void)
 {
-	if (m_ChunkMap != NULL)
-	{
-		Disable();
-	}
+	ASSERT(m_ChunkMap == NULL);
 	m_Chunks.clear();
 }
 
diff --git a/src/ChunkStay.h b/src/ChunkStay.h
@@ -36,8 +36,12 @@ class cChunkStay
 {
 public:
 	cChunkStay(void);
+	
+	/** Deletes the object. Note that this calls Clear(), which means that the ChunkStay needs to be disabled. */
 	virtual ~cChunkStay();
 	
+	/** Clears all the chunks that have been added.
+	To be used only while the ChunkStay object is not enabled. */
 	void Clear(void);
 	
 	/** Adds a chunk to be locked from unloading.
diff --git a/src/LightingThread.cpp b/src/LightingThread.cpp
@@ -286,6 +286,7 @@ void cLightingThread::LightChunk(cLightingChunkStay & a_Item)
 	{
 		a_Item.m_CallbackAfter->Call(a_Item.m_ChunkX, a_Item.m_ChunkZ);
 	}
+	a_Item.Disable();
 	delete &a_Item;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,7 @@ void cLightingThread::LightChunk(cLightingChunkStay & a_Item)`
`286`	`286`	`{`
`287`	`287`	`a_Item.m_CallbackAfter->Call(a_Item.m_ChunkX, a_Item.m_ChunkZ);`
`288`	`288`	`}`
	`289`	`+ a_Item.Disable();`
`289`	`290`	`delete &a_Item;`
`290`	`291`	`}`
`291`	`292`