From 4f36ab10c1fea5a1599ea00c2192ad5b4cd6f8f2 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 28 Aug 2021 00:02:19 -0400 Subject: [PATCH] Add back "Name already taken" message --- src/gui/game/GOLTool.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/game/GOLTool.cpp b/src/gui/game/GOLTool.cpp index 4d553bf1a..861bbac53 100644 --- a/src/gui/game/GOLTool.cpp +++ b/src/gui/game/GOLTool.cpp @@ -158,7 +158,11 @@ void GOLWindow::Validate() auto color1 = (((highColour.Red << 8) | highColour.Green) << 8) | highColour.Blue; auto color2 = (((lowColour.Red << 8) | lowColour.Green) << 8) | lowColour.Blue; - AddCustomGol(ruleString, nameString, color1, color2); + if (!AddCustomGol(ruleString, nameString, color1, color2)) + { + new ErrorMessage("Could not add GOL type", "Name already taken"); + return; + } tool->gameModel->SelectNextIdentifier = "DEFAULT_PT_LIFECUST_" + nameString.ToAscii(); tool->gameModel->SelectNextTool = toolSelection;