diff --git a/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 5ea376f5b3c..99bdf98130d 100644 --- a/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -2741,13 +2741,15 @@ void ControlBar::showRallyPoint(const Coord3D* loc) if (m_rallyPointDrawableID == INVALID_DRAWABLE_ID) { const ThingTemplate* ttn = TheThingFactory->findTemplate("RallyPointMarker"); - marker = TheThingFactory->newDrawable(ttn); - DEBUG_ASSERTCRASH(marker, ("showRallyPoint: Unable to create rally point drawable")); - if (marker) + if (!ttn) { - marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE); - m_rallyPointDrawableID = marker->getID(); + return; } + + marker = TheThingFactory->newDrawable(ttn); + DEBUG_ASSERTCRASH(marker, ("showRallyPoint: Unable to create rally point drawable")); + marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE); + m_rallyPointDrawableID = marker->getID(); } else marker = TheGameClient->findDrawableByID(m_rallyPointDrawableID);