From: zeuner <github@quidecco.de>
Date: Fri, 17 Mar 2017 20:28:43 +0000 (+0100)
Subject: avoid crashing when accessing mapgen early (#5384)
X-Git-Tag: 0.4.16~375
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba0a8dabeff92ecd87d28b4b5b4010e958be5851;p=oweals%2Fminetest.git

avoid crashing when accessing mapgen early (#5384)
---

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 8719a9eb3..a3efb09e7 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -174,6 +174,9 @@ bool EmergeManager::initMapgens(MapgenParams *params)
 
 Mapgen *EmergeManager::getCurrentMapgen()
 {
+	if (!m_threads_active)
+		return NULL;
+
 	for (u32 i = 0; i != m_threads.size(); i++) {
 		if (m_threads[i]->isCurrentThread())
 			return m_threads[i]->m_mapgen;