ContentCAO: Fix segfault when minimap is disabled

SmallJoker · SmallJoker · commit c940a57a384b · 2020-11-08T11:30:16.000+01:00
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
@@ -894,6 +894,9 @@ u16 GenericCAO::getLightPosition(v3s16 *pos)
 
 void GenericCAO::updateMarker()
 {
+	if (!m_client->getMinimap())
+		return;
+
 	if (!m_prop.show_on_minimap) {
 		if (m_marker)
 			m_client->getMinimap()->removeMarker(&m_marker);

Original file line number	Diff line number	Diff line change
`@@ -894,6 +894,9 @@ u16 GenericCAO::getLightPosition(v3s16 *pos)`
`894`	`894`
`895`	`895`	`void GenericCAO::updateMarker()`
`896`	`896`	`{`
	`897`	`+ if (!m_client->getMinimap())`
	`898`	`+ return;`
	`899`	`+`
`897`	`900`	`if (!m_prop.show_on_minimap) {`
`898`	`901`	`if (m_marker)`
`899`	`902`	`m_client->getMinimap()->removeMarker(&m_marker);`