From 9b978db0c2578b06c5669096e325c1ce70864edc Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sun, 26 Jan 2014 01:12:18 -0500
Subject: Fix use of previously deallocated EmergeManager

---
 src/emerge.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/emerge.h')

diff --git a/src/emerge.h b/src/emerge.h
index b2b00adc9..17097327b 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -87,6 +87,8 @@ public:
 	std::vector<Mapgen *> mapgen;
 	std::vector<EmergeThread *> emergethread;
 
+	bool threads_active;
+
 	//settings
 	MapgenParams *params;
 	bool mapgen_debug_info;
@@ -119,7 +121,8 @@ public:
 	Mapgen *createMapgen(std::string mgname, int mgid,
 						MapgenParams *mgparams);
 	MapgenParams *createMapgenParams(std::string mgname);
-	void startAllThreads();
+	void startThreads();
+	void stopThreads();
 	bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
 
 	void registerMapgen(std::string name, MapgenFactory *mgfactory);
-- 
cgit v1.2.3