From 3e58c7d03d181e5ea6071e7a43e3783a85e39d35 Mon Sep 17 00:00:00 2001
From: pavanvo <anton@pavanvo.me>
Date: Mon, 5 Sep 2022 19:23:53 +0400
Subject: [PATCH] fix: Morph Queue

---
 source/glest_game/game/commander.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp
index 9ba5b7b4..2650e572 100644
--- a/source/glest_game/game/commander.cpp
+++ b/source/glest_game/game/commander.cpp
@@ -994,7 +994,8 @@ Command* Commander::buildCommand(const NetworkCommand* networkCommand) const {
 	const UnitType* unitType= world->findUnitTypeById(unit->getFaction()->getType(), networkCommand->getUnitTypeId());
 	
 	if( networkCommand->getUnitTypeId() > -1 &&  networkCommand->getWantQueue()) { //Morph Queue
-		ct = unitType->findCommandTypeById(networkCommand->getCommandTypeId());
+		auto mct = unitType->findCommandTypeById(networkCommand->getCommandTypeId());
+		if(mct) ct = mct;
 	}
 
 	// debug test!