Do not crash on build cancelations. Hopefully closes ticket:3807

Warzone2100 · Nov 24, 2012 · 2884e6d · 2884e6d
1 parent ffda8b2
commit 2884e6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/structure.cpp b/src/structure.cpp
@@ -993,16 +993,16 @@ bool structSetManufacture(STRUCTURE *psStruct, DROID_TEMPLATE *psTempl, QUEUE_MO
 	                 || psStruct->pStructureType->type == REF_VTOL_FACTORY, "Invalid structure type %d for factory",
 	                 (int)psStruct->pStructureType->type);
 	/* psTempl might be NULL if the build is being cancelled in the middle */
-
-	ASSERT_OR_RETURN(false, (validTemplateForFactory(psTempl, psStruct) && researchedTemplate(psTempl, psStruct->player, true)) || psStruct->player == scavengerPlayer() || !bMultiPlayer, "Wrong template for player %d factory, type %d.", psStruct->player, psStruct->pStructureType->type);
+	ASSERT_OR_RETURN(false, !psTempl || (validTemplateForFactory(psTempl, psStruct) && researchedTemplate(psTempl, psStruct->player, true)) 
+	                 || psStruct->player == scavengerPlayer() || !bMultiPlayer, 
+	                 "Wrong template for player %d factory, type %d.", psStruct->player, psStruct->pStructureType->type);
 
 	psFact = &psStruct->pFunctionality->factory;
 
 	if (mode == ModeQueue)
 	{
 		sendStructureInfo(psStruct, STRUCTUREINFO_MANUFACTURE, psTempl);
 		setStatusPendingStart(*psFact, psTempl);
-
 		return true;  // Wait for our message before doing anything.
 	}
 

diff --git a/src/template.cpp b/src/template.cpp
@@ -82,6 +82,7 @@ static bool researchedWeap(DROID_TEMPLATE *psCurr, int player, int weapIndex, bo
 
 bool researchedTemplate(DROID_TEMPLATE *psCurr, int player, bool allowRedundant)
 {
+	ASSERT_OR_RETURN(false, psCurr, "Given a null template");
 	// super hack -- cyborgs and transports are special, only check their body
 	switch (psCurr->droidType)
 	{