From 3545159a0b1d3af373096e2873338fe42b9a3ce6 Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Fri, 19 Apr 2024 21:31:18 +0200
Subject: [PATCH] Update SettingsWindow.cpp

---
 .../SandMan/Windows/SettingsWindow.cpp        | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
index efb89778..a04171f7 100644
--- a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
@@ -1301,20 +1301,24 @@ void CSettingsWindow::OnGetCert()
 		"If you have attempted to enter the UpdateKey or the Signature from a certificate, "
 		"that is not correct, please enter the entire certificate into the text area above instead.");
 	}
+	else if(Certificate.isEmpty())
+	{
+		if (Serial.length() > 5 && Serial.at(4).toUpper() == 'U') {
+			Message = tr("You are attempting to use a feature Upgrade-Key without having entered a pre-existing supporter certificate. "
+				"Please note that this type of key (<b>as it is clearly stated in bold on the website</b) requires you to have a pre-existing valid supporter certificate; it is useless without one."
+				"<br />If you want to use the advanced features, you need to obtain both a standard certificate and the feature upgrade key to unlock advanced functionality.");
+		}
 
-	else if (Serial.length() > 5 && Serial.at(4).toUpper() == 'U') {
-		Message = tr("You are attempting to use a feature Upgrade-Key without having entered a pre-existing supporter certificate. "
-			"Please note that this type of key (<b>as it is clearly stated in bold on the website</b) requires you to have a pre-existing valid supporter certificate; it is useless without one."
-			"<br />If you want to use the advanced features, you need to obtain both a standard certificate and the feature upgrade key to unlock advanced functionality.");
+		else if (Serial.length() > 5 && Serial.at(4).toUpper() == 'R') {
+			Message = tr("You are attempting to use a Renew-Key without having entered a pre-existing supporter certificate. "
+				"Please note that this type of key (<b>as it is clearly stated in bold on the website</b) requires you to have a pre-existing valid supporter certificate; it is useless without one.");
+		}
+
+		if (!Message.isEmpty()) 
+			Message += tr("<br /><br /><u>If you have not read the product description and obtained this key by mistake, please contact us via email (provided on our website) to resolve this issue.</u>");
 	}
-
-	else if (Serial.length() > 5 && Serial.at(4).toUpper() == 'R') {
-		Message = tr("You are attempting to use a Renew-Key without having entered a pre-existing supporter certificate. "
-			"Please note that this type of key (<b>as it is clearly stated in bold on the website</b) requires you to have a pre-existing valid supporter certificate; it is useless without one.");
-	}
-
+	
 	if (!Message.isEmpty()) {
-		Message += tr("<br /><br /><u>If you have not read the product description and obtained this key by mistake, please contact us via email (provided on our website) to resolve this issue.</u>");
 		CSandMan::ShowMessageBox(this, QMessageBox::Critical, Message);
 		return;
 	}