bugfix(worldbuilder): Avoid taking action on cancel button for script conditions and actions (TheSuperHackers#2065)

Author: Caball009

Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp

@@ -116,11 +116,13 @@ void ScriptActionsFalse::OnEditAction()
 	}
 	EditAction cDlg;
 	cDlg.setAction(m_falseAction);
-	cDlg.DoModal();
-	ScriptDialog::updateScriptWarning(m_script);
-	pList->DeleteString(m_index);
-	pList->InsertString(m_index, m_falseAction->getUiText().str());
-	pList->SetCurSel(m_index);
+	if (cDlg.DoModal() == IDOK)
+	{
+		ScriptDialog::updateScriptWarning(m_script);
+		pList->DeleteString(m_index);
+		pList->InsertString(m_index, m_falseAction->getUiText().str());
+		pList->SetCurSel(m_index);
+	}
 }
 
 void ScriptActionsFalse::enableUI()

Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp

@@ -116,11 +116,13 @@ void ScriptActionsTrue::OnEditAction()
 	}
 	EditAction cDlg;
 	cDlg.setAction(m_action);
-	cDlg.DoModal();
-	ScriptDialog::updateScriptWarning(m_script);
-	pList->DeleteString(m_index);
-	pList->InsertString(m_index, m_action->getUiText().str());
-	pList->SetCurSel(m_index);
+	if (cDlg.DoModal() == IDOK)
+	{
+		ScriptDialog::updateScriptWarning(m_script);
+		pList->DeleteString(m_index);
+		pList->InsertString(m_index, m_action->getUiText().str());
+		pList->SetCurSel(m_index);
+	}
 }
 
 void ScriptActionsTrue::enableUI()

Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp

@@ -126,18 +126,20 @@ void ScriptConditionsDlg::OnEditCondition()
 	}
 	EditCondition cDlg;
 	cDlg.setCondition(m_condition);
-	cDlg.DoModal();
-	ScriptDialog::updateScriptWarning(m_script);
-	pList->DeleteString(m_index);
-	AsciiString label;
-	Bool first = false;
-	if (m_orCondition && m_orCondition->getFirstAndCondition() == m_condition) {
-		first = true;
+	if (cDlg.DoModal() == IDOK)
+	{
+		ScriptDialog::updateScriptWarning(m_script);
+		pList->DeleteString(m_index);
+		AsciiString label;
+		Bool first = false;
+		if (m_orCondition && m_orCondition->getFirstAndCondition() == m_condition) {
+			first = true;
+		}
+		if (first) label = "  ";
+		else label = "    AND ";
+		label.concat(m_condition->getUiText());
+		pList->InsertString(m_index, label.str());
 	}
-	if (first) label = "  ";
-	else label = "    AND ";
-	label.concat(m_condition->getUiText());
-	pList->InsertString(m_index, label.str());
 }
 
 void ScriptConditionsDlg::enableUI()

GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp

@@ -116,11 +116,13 @@ void ScriptActionsFalse::OnEditAction()
 	}
 	EditAction cDlg;
 	cDlg.setAction(m_falseAction);
-	cDlg.DoModal();
-	ScriptDialog::updateScriptWarning(m_script);
-	pList->DeleteString(m_index);
-	pList->InsertString(m_index, m_falseAction->getUiText().str());
-	pList->SetCurSel(m_index);
+	if (cDlg.DoModal() == IDOK)
+	{
+		ScriptDialog::updateScriptWarning(m_script);
+		pList->DeleteString(m_index);
+		pList->InsertString(m_index, m_falseAction->getUiText().str());
+		pList->SetCurSel(m_index);
+	}
 }
 
 void ScriptActionsFalse::enableUI()

GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp

@@ -116,11 +116,13 @@ void ScriptActionsTrue::OnEditAction()
 	}
 	EditAction cDlg;
 	cDlg.setAction(m_action);
-	cDlg.DoModal();
-	ScriptDialog::updateScriptWarning(m_script);
-	pList->DeleteString(m_index);
-	pList->InsertString(m_index, m_action->getUiText().str());
-	pList->SetCurSel(m_index);
+	if (cDlg.DoModal() == IDOK)
+	{
+		ScriptDialog::updateScriptWarning(m_script);
+		pList->DeleteString(m_index);
+		pList->InsertString(m_index, m_action->getUiText().str());
+		pList->SetCurSel(m_index);
+	}
 }
 
 void ScriptActionsTrue::enableUI()

GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp

@@ -126,18 +126,20 @@ void ScriptConditionsDlg::OnEditCondition()
 	}
 	EditCondition cDlg;
 	cDlg.setCondition(m_condition);
-	cDlg.DoModal();
-	ScriptDialog::updateScriptWarning(m_script);
-	pList->DeleteString(m_index);
-	AsciiString label;
-	Bool first = false;
-	if (m_orCondition && m_orCondition->getFirstAndCondition() == m_condition) {
-		first = true;
+	if (cDlg.DoModal() == IDOK)
+	{
+		ScriptDialog::updateScriptWarning(m_script);
+		pList->DeleteString(m_index);
+		AsciiString label;
+		Bool first = false;
+		if (m_orCondition && m_orCondition->getFirstAndCondition() == m_condition) {
+			first = true;
+		}
+		if (first) label = "  ";
+		else label = "    AND ";
+		label.concat(m_condition->getUiText());
+		pList->InsertString(m_index, label.str());
 	}
-	if (first) label = "  ";
-	else label = "    AND ";
-	label.concat(m_condition->getUiText());
-	pList->InsertString(m_index, label.str());
 }
 
 void ScriptConditionsDlg::enableUI()