Fix for crash when generating a map after new scene load

EQEmu · Jan 13, 2016 · cade414 · cade414
1 parent 2f56712
commit cade414
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/map_edit/module_navigation.cpp b/map_edit/module_navigation.cpp
@@ -214,6 +214,7 @@ void ModuleNavigation::OnSceneLoad(const char *zone_name)
 
 	if (m_nav_mesh) {
 		dtFreeNavMesh(m_nav_mesh);
+		m_nav_mesh = nullptr;
 	}
 
 	if (!LoadNavSettings()) {
@@ -1211,13 +1212,15 @@ void ModuleNavigation::LoadNavMesh()
 		uint32_t number_of_tiles = 0;
 		if (fread(&number_of_tiles, sizeof(uint32_t), 1, f) != 1) {
 			dtFreeNavMesh(m_nav_mesh);
+			m_nav_mesh = nullptr;
 			fclose(f);
 			return;
 		}
 
 		dtNavMeshParams params;
 		if (fread(&params, sizeof(dtNavMeshParams), 1, f) != 1) {
 			dtFreeNavMesh(m_nav_mesh);
+			m_nav_mesh = nullptr;
 			fclose(f);
 			return;
 		}
@@ -1226,6 +1229,7 @@ void ModuleNavigation::LoadNavMesh()
 		if (dtStatusFailed(status))
 		{
 			dtFreeNavMesh(m_nav_mesh);
+			m_nav_mesh = nullptr;
 			fclose(f);
 			return;
 		}
@@ -1235,26 +1239,30 @@ void ModuleNavigation::LoadNavMesh()
 			uint32_t tile_ref = 0;
 			if (fread(&tile_ref, sizeof(uint32_t), 1, f) != 1) {
 				dtFreeNavMesh(m_nav_mesh);
+				m_nav_mesh = nullptr;
 				fclose(f);
 				return;
 			}
 
 			int32_t data_size = 0;
 			if (fread(&data_size, sizeof(int32_t), 1, f) != 1) {
 				dtFreeNavMesh(m_nav_mesh);
+				m_nav_mesh = nullptr;
 				fclose(f);
 				return;
 			}
 
 			if (!tile_ref || !data_size) {
 				dtFreeNavMesh(m_nav_mesh);
+				m_nav_mesh = nullptr;
 				fclose(f);
 				return;
 			}
 
 			unsigned char* data = (unsigned char*)dtAlloc(data_size, DT_ALLOC_PERM);
 			if (fread(data, data_size, 1, f) != 1) {
 				dtFreeNavMesh(m_nav_mesh);
+				m_nav_mesh = nullptr;
 				fclose(f);
 				return;
 			}