Core/Maps: fixed a crash regarding terrain swap grids

This commit is contained in:
Ovahlord
2018-07-22 15:50:32 +02:00
parent 037f83c7dc
commit f9ca7d5dcf
2 changed files with 2 additions and 2 deletions

View File

@@ -2360,7 +2360,7 @@ GridMap* Map::GetGrid(uint32 mapId, float x, float y)
GridMap* grid = GridMaps[gx][gy];
auto childMapItr = std::find_if(m_childTerrainMaps->begin(), m_childTerrainMaps->end(), [mapId](Map* childTerrainMap) { return childTerrainMap->GetId() == mapId; });
if (childMapItr != m_childTerrainMaps->end() && (*childMapItr)->GridMaps[gx][gy]->fileExists())
if (childMapItr != m_childTerrainMaps->end() && (*childMapItr)->GridMaps[gx][gy] && (*childMapItr)->GridMaps[gx][gy]->fileExists())
grid = (*childMapItr)->GridMaps[gx][gy];
return grid;