From 98406d127da0bf5dd9fba99a9227cf29238c2a2f Mon Sep 17 00:00:00 2001 From: Arseniy Shestakov Date: Fri, 14 Jul 2017 16:50:29 +0300 Subject: [PATCH] CGMonolith: fix crash on initialization here too --- lib/mapObjects/MiscObjects.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/mapObjects/MiscObjects.cpp b/lib/mapObjects/MiscObjects.cpp index 02ecbca56..d5a7713a3 100644 --- a/lib/mapObjects/MiscObjects.cpp +++ b/lib/mapObjects/MiscObjects.cpp @@ -1044,6 +1044,9 @@ TeleportChannelID CGMonolith::findMeChannel(std::vector IDs, int SubID) con { for(auto obj : cb->gameState()->map->objects) { + if(!obj) + continue; + auto teleportObj = dynamic_cast(cb->getObj(obj->id)); if(teleportObj && vstd::contains(IDs, teleportObj->ID) && teleportObj->subID == SubID) return teleportObj->channel;