Bläddra i källkod

Fix crash on h3c->vcmp conversion via editor

Ivan Savenko 4 månader sedan
förälder
incheckning
354253c27a
2 ändrade filer med 6 tillägg och 1 borttagningar
  1. 3 1
      mapeditor/helper.cpp
  2. 3 0
      mapeditor/mapcontroller.cpp

+ 3 - 1
mapeditor/helper.cpp

@@ -85,7 +85,9 @@ void Helper::saveCampaign(std::shared_ptr<CampaignState> campaignState, const QS
 	auto saver = std::make_shared<CZipSaver>(io, filename.toStdString());
 	for(auto & scenario : campaignState->allScenarios())
 	{
-		auto map = campaignState->getMap(scenario, nullptr);
+		EditorCallback cb(nullptr);
+		auto map = campaignState->getMap(scenario, &cb);
+		cb.setMap(map.get());
 		MapController::repairMap(map.get());
 		CMemoryBuffer serializeBuffer;
 		{

+ 3 - 0
mapeditor/mapcontroller.cpp

@@ -139,6 +139,9 @@ void MapController::repairMap(CMap * map)
 
 	for(auto obj : allImpactedObjects)
 	{
+		if(obj == nullptr)
+			continue;
+
 		//fix flags
 		if(obj->asOwnable() != nullptr && obj->getOwner() == PlayerColor::UNFLAGGABLE)
 		{