Fix null dereference when loading schematic from definition without a NodeDefManager

kwolekr · kwolekr · commit 20aa78cffb65 · 2015-05-17T22:32:35.000-04:00
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
@@ -215,7 +215,8 @@ Schematic *load_schematic_from_def(lua_State *L, int index,
 		}
 	}
 
-	ndef->pendNodeResolve(schem);
+	if (ndef)
+		ndef->pendNodeResolve(schem);
 
 	return schem;
 }

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ Schematic load_schematic_from_def(lua_State L, int index,`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`218`		`- ndef->pendNodeResolve(schem);`
	`218`	`+ if (ndef)`
	`219`	`+ ndef->pendNodeResolve(schem);`
`219`	`220`
`220`	`221`	`return schem;`
`221`	`222`	`}`