avoid crashing when accessing mapgen early (#5384)

zeuner · nerzhul · commit ba0a8dabeff9 · 2017-03-17T21:28:43.000+01:00
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,9 @@ bool EmergeManager::initMapgens(MapgenParams *params)`
`174`	`174`
`175`	`175`	`Mapgen *EmergeManager::getCurrentMapgen()`
`176`	`176`	`{`
	`177`	`+ if (!m_threads_active)`
	`178`	`+ return NULL;`
	`179`	`+`
`177`	`180`	`for (u32 i = 0; i != m_threads.size(); i++) {`
`178`	`181`	`if (m_threads[i]->isCurrentThread())`
`179`	`182`	`return m_threads[i]->m_mapgen;`