diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-01-26 01:12:18 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-01-26 01:12:18 -0500 |
| commit | 9b978db0c2578b06c5669096e325c1ce70864edc (patch) | |
| tree | 409944cd4d2ca5b95538bb70dc2168696cc1774b /src/emerge.h | |
| parent | 6e352e3cbff7d4256657776a7dff828a43d948db (diff) | |
| download | minetest-9b978db0c2578b06c5669096e325c1ce70864edc.tar.gz minetest-9b978db0c2578b06c5669096e325c1ce70864edc.tar.bz2 minetest-9b978db0c2578b06c5669096e325c1ce70864edc.zip | |
Fix use of previously deallocated EmergeManager
Diffstat (limited to 'src/emerge.h')
| -rw-r--r-- | src/emerge.h | 5 |
1 files changed, 4 insertions, 1 deletions
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); |