Fix another research cancellation not registering in UI.

If cancelling a research by clicking on the current research, in the research menu (not right-clicking on the facility), then the next completed research in the same facility would linger after completion. Research is cancelled twice when clicking on the current research, but was incorrectly registered as cancelling three times, confusing the facility. Also, when cancelling, the second cancellation would fail to be registered, due to the ID of the research facility not being sent. Fixes ticket:3130.
Warzone2100 · Feb 6, 2012 · ae59186 · ae59186
1 parent a271286
commit ae59186
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/hci.cpp b/src/hci.cpp
@@ -2591,6 +2591,7 @@ static void intProcessStats(UDWORD id)
 					{
 						if (psObjSelected->type == OBJ_STRUCTURE )
 						{
+							// TODO This call seems to be redundant, since cancelResearch is called from objSetStatsFunc==setResearchStats.
 							cancelResearch((STRUCTURE *)psObjSelected, ModeQueue);
 						}
 					}
@@ -5422,7 +5423,6 @@ static bool setResearchStats(BASE_OBJECT *psObj, BASE_STATS *psStats)
 		else
 		{
 			cancelResearch(psBuilding, ModeQueue);
-			setStatusPendingCancel(*psResFacilty);
 		}
 		//stop the button from flashing once a topic has been chosen
 		stopReticuleButtonFlash(IDRET_RESEARCH);

diff --git a/src/research.cpp b/src/research.cpp
@@ -1338,7 +1338,7 @@ void cancelResearch(STRUCTURE *psBuilding, QUEUE_MODE mode)
 		if (mode == ModeQueue)
 		{
 			// Tell others that we want to stop researching something.
-			sendResearchStatus(NULL, topicInc, psBuilding->player, false);
+			sendResearchStatus(psBuilding, topicInc, psBuilding->player, false);
 			// Immediately tell the UI that we can research this now. (But don't change the game state.)
 			MakeResearchCancelledPending(pPlayerRes);
 			setStatusPendingCancel(*psResFac);