@@ -179,11 +179,6 @@ void ResearchInfoState::btnOkClick(Action *)
  */
 void ResearchInfoState::btnCancelClick(Action *)
 {
-	const RuleResearch *ruleResearch = _rule ? _rule : _project->getRules();
-	if (ruleResearch->needItem() && ruleResearch->destroyItem())
-	{
-		_base->getStorageItems()->addItem(ruleResearch->getName(), 1);
-	}
 	_base->removeResearch(_project);
 	_game->popState();
 }
 
@@ -1095,6 +1095,15 @@ void Base::removeResearch(ResearchProject * project)
 	{
 		_research.erase(iter);
 	}
+
+	const RuleResearch *ruleResearch = project->getRules();
+	if (!project->isFinished())
+	{
+		if (ruleResearch->needItem() && ruleResearch->destroyItem())
+		{
+			getStorageItems()->addItem(ruleResearch->getName(), 1);
+		}
+	}
 	delete project;
 }
 
 
@@ -37,11 +37,15 @@ ResearchProject::ResearchProject(RuleResearch * p, int c) : _project(p), _assign
 bool ResearchProject::step()
 {
 	_spent += _assigned;
-	if (_spent >= getCost())
-	{
-		return true;
-	}
-	return false;
+	return isFinished();
+}
+
+/**
+ * gets state of project.
+ */
+bool ResearchProject::isFinished()
+{
+	return _spent >= getCost();
 }
 
 /**
 
@@ -39,6 +39,8 @@ class ResearchProject
 	ResearchProject(RuleResearch * p, int c = 0);
 	/// Game logic. Called every new day to compute time spent.
 	bool step();
+	/// gets state of project.
+	bool isFinished();
 	/// set the number of scientist assigned to this ResearchProject
 	void setAssigned (int nb);
 	/// get the number of scientist assigned to this ResearchProject
Original file line number	Diff line number	Diff line change
`@@ -179,11 +179,6 @@ void ResearchInfoState::btnOkClick(Action *)`
`179`	`179`	`*/`
`180`	`180`	`void ResearchInfoState::btnCancelClick(Action *)`
`181`	`181`	`{`
`182`		`- const RuleResearch *ruleResearch = _rule ? _rule : _project->getRules();`
`183`		`- if (ruleResearch->needItem() && ruleResearch->destroyItem())`
`184`		`- {`
`185`		`- _base->getStorageItems()->addItem(ruleResearch->getName(), 1);`
`186`		`- }`
`187`	`182`	`_base->removeResearch(_project);`
`188`	`183`	`_game->popState();`
`189`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1095,6 +1095,15 @@ void Base::removeResearch(ResearchProject * project)`
`1095`	`1095`	`{`
`1096`	`1096`	`_research.erase(iter);`
`1097`	`1097`	`}`
	`1098`	`+`
	`1099`	`+ const RuleResearch *ruleResearch = project->getRules();`
	`1100`	`+ if (!project->isFinished())`
	`1101`	`+ {`
	`1102`	`+ if (ruleResearch->needItem() && ruleResearch->destroyItem())`
	`1103`	`+ {`
	`1104`	`+ getStorageItems()->addItem(ruleResearch->getName(), 1);`
	`1105`	`+ }`
	`1106`	`+ }`
`1098`	`1107`	`delete project;`
`1099`	`1108`	`}`
`1100`	`1109`