bugfix(controlbar): Fix Angry Mob selection and clearing of unit information from the Control Bar when deselecting a unit during Replay playback (#1433)

Author: Stubbjax

Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp

@@ -1414,7 +1414,6 @@ void ControlBar::update( void )
 			populateObserverInfoWindow();
 
 		Drawable *drawToEvaluateFor = NULL;
-		Bool multiSelect = FALSE;
 		if( TheInGameUI->getSelectCount() > 1 )
 		{
 			// Attempt to isolate a Drawable here to evaluate
@@ -1423,17 +1422,15 @@ void ControlBar::update( void )
 			// but is represented in the UI as a single unit,
 			// so we must isolate and evaluate only the Nexus
 			drawToEvaluateFor = TheGameClient->findDrawableByID( TheInGameUI->getSoloNexusSelectedDrawableID() ) ;
-			multiSelect = ( drawToEvaluateFor == NULL );
-
 		}
 		else // get the first and only drawble in the selection list
 			// TheSuperHackers @fix Mauller 07/04/2025 The first access to this can return an empty list
 			if (!TheInGameUI->getAllSelectedDrawables()->empty()) {
 				drawToEvaluateFor = TheInGameUI->getAllSelectedDrawables()->front();
-				Object *obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
-				setPortraitByObject( obj );
 			}
 
+		Object* obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
+		setPortraitByObject(obj);
 		return;
 	}
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp

@@ -1437,7 +1437,6 @@ void ControlBar::update( void )
 			populateObserverInfoWindow();
 
 		Drawable *drawToEvaluateFor = NULL;
-		Bool multiSelect = FALSE;
 		if( TheInGameUI->getSelectCount() > 1 )
 		{
 			// Attempt to isolate a Drawable here to evaluate
@@ -1446,17 +1445,15 @@ void ControlBar::update( void )
 			// but is represented in the UI as a single unit,
 			// so we must isolate and evaluate only the Nexus
 			drawToEvaluateFor = TheGameClient->findDrawableByID( TheInGameUI->getSoloNexusSelectedDrawableID() ) ;
-			multiSelect = ( drawToEvaluateFor == NULL );
-
 		}
 		else // get the first and only drawble in the selection list
 			// TheSuperHackers @fix Mauller 07/04/2025 The first access to this can return an empty list
 			if (!TheInGameUI->getAllSelectedDrawables()->empty()) {
 				drawToEvaluateFor = TheInGameUI->getAllSelectedDrawables()->front();
-				Object *obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
-				setPortraitByObject( obj );
 			}
 
+		Object* obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
+		setPortraitByObject(obj);
 		return;
 	}