Fixed crash that could occur if disabling a mod mid-session (like you should ever do that anyways... hmm)

Causeless · Causeless · commit f46af36f2b33 · 2024-08-17T20:00:13.000+01:00
diff --git a/Source/Managers/PresetMan.cpp b/Source/Managers/PresetMan.cpp
@@ -131,7 +131,8 @@ const Entity* PresetMan::GetEntityPreset(const std::string& typeName, std::strin
 		}
 	} else {
 		// Try to get it from the asked for module
-		pRetEntity = g_ModuleMan.GetDataModule(whichModule)->GetEntityPreset(typeName, presetName);
+		DataModule* dataModule = g_ModuleMan.GetDataModule(whichModule);
+		pRetEntity = dataModule ? dataModule->GetEntityPreset(typeName, presetName) : nullptr;
 
 		// If couldn't find it in there, then try all the official modules!
 		if (!pRetEntity) {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,8 @@ const Entity* PresetMan::GetEntityPreset(const std::string& typeName, std::strin`
`131`	`131`	`}`
`132`	`132`	`} else {`
`133`	`133`	`// Try to get it from the asked for module`
`134`		`- pRetEntity = g_ModuleMan.GetDataModule(whichModule)->GetEntityPreset(typeName, presetName);`
	`134`	`+ DataModule* dataModule = g_ModuleMan.GetDataModule(whichModule);`
	`135`	`+ pRetEntity = dataModule ? dataModule->GetEntityPreset(typeName, presetName) : nullptr;`
`135`	`136`
`136`	`137`	`// If couldn't find it in there, then try all the official modules!`
`137`	`138`	`if (!pRetEntity) {`