From f57d503b414669594bdee1d00d5251644fe6c927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= <lbphacker@gmail.com>
Date: Mon, 12 Oct 2020 17:24:10 +0200
Subject: [PATCH] Don't close PROP and CUST dialogs when trying to validate
 empty strings

---
 src/gui/game/GOLTool.cpp      | 4 ++--
 src/gui/game/PropertyTool.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gui/game/GOLTool.cpp b/src/gui/game/GOLTool.cpp
index adddce985..88c27404d 100644
--- a/src/gui/game/GOLTool.cpp
+++ b/src/gui/game/GOLTool.cpp
@@ -51,12 +51,12 @@ toolSelection(toolSelection)
 	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
 	okayButton->SetActionCallback({ [this] {
-		CloseActiveWindow();
 		if (nameField->GetText().length() && ruleField->GetText().length())
 		{
+			CloseActiveWindow();
 			Validate();
+			SelfDestruct();
 		}
-		SelfDestruct();
 	} });
 	AddComponent(okayButton);
 	SetOkayButton(okayButton);
diff --git a/src/gui/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp
index 1abe9c149..b425b1348 100644
--- a/src/gui/game/PropertyTool.cpp
+++ b/src/gui/game/PropertyTool.cpp
@@ -57,10 +57,12 @@ sim(sim_)
 	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
 	okayButton->SetActionCallback({ [this] {
-		CloseActiveWindow();
 		if (textField->GetText().length())
+		{
+			CloseActiveWindow();
 			SetProperty();
-		SelfDestruct();
+			SelfDestruct();
+		}
 	} });
 	AddComponent(okayButton);
 	SetOkayButton(okayButton);