Fix crash caused by Lua error during startup (#7473)

red-001 · SmallJoker · commit 07b1743d3db0 · 2018-06-22T21:04:41.000+02:00
diff --git a/src/emerge.cpp b/src/emerge.cpp
@@ -169,7 +169,10 @@ EmergeManager::~EmergeManager()
 		}
 
 		delete thread;
-		delete m_mapgens[i];
+
+		// Mapgen init might not be finished if there is an error during startup.
+		if (m_mapgens.size() > i)
+			delete m_mapgens[i];
 	}
 
 	delete biomemgr;

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,10 @@ EmergeManager::~EmergeManager()`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`delete thread;`
`172`		`- delete m_mapgens[i];`
	`172`	`+`
	`173`	`+ // Mapgen init might not be finished if there is an error during startup.`
	`174`	`+ if (m_mapgens.size() > i)`
	`175`	`+ delete m_mapgens[i];`
`173`	`176`	`}`
`174`	`177`
`175`	`178`	`delete biomemgr;`