Attempt to Prevent Repair on Incompatible instalation

Author: jsgnextortex

include/launcher/isaac_installation.h

@@ -69,6 +69,32 @@ class InstallationData {
     inline bool IsValid() const {
         return _isValid;
     }
+
+    inline std::string GetUpdatedReason() const { //instalationdata is a const in a lot of places and I dont think this alone justifies changing it(or maybe Im just too lazy to do it rn)...so, here goes nothing.
+        if (_isCompatibleWithRepentogon) {
+            if (_needsPatch) {
+                return "Will work, the launcher has a patch to adapt it to a compatible version.";
+            }
+            else {
+                return "Should just work.";
+            }
+        }
+        else {
+            if (!strncmp(GetVersion(), "v1.7", strlen("v1.7"))) {
+                return "You need the Repentance+ dlc, you currently only have Repentance installed (WHICH IS NOT THE SAME).";
+            }
+            else {
+                return "You dont have a proper version or your exe is corrupted/cracked \n(verify your files with steam or download the specific version rgon uses)";
+            }
+        }
+        return _CompatReason;
+    }
+
+    inline std::string UpdateReason() {
+        _CompatReason = GetUpdatedReason();
+        return _CompatReason;
+    }
+
     inline std::string GetReason() const {
         return _CompatReason;
     }

src/isaac_installation.cpp

@@ -291,23 +291,7 @@ bool InstallationData::Validate(std::string const& sourcePath, bool repentogon)
 	const bool alreadyCompatible = RepentogonInstallation::IsIsaacVersionCompatible(GetVersion());
 	_needsPatch = !repentogon && !alreadyCompatible && PatchIsAvailable();
 	_isCompatibleWithRepentogon = alreadyCompatible || _needsPatch;
-	if (_isCompatibleWithRepentogon) {
-		if (_needsPatch) {
-			_CompatReason = "Will work, the launcher has a patch to adapt it to a compatible version.";
-		}
-		else {
-			_CompatReason = "Should just work.";
-		}
-	}
-	else {
-		if (!strncmp(GetVersion(), "v1.7", strlen("v1.7"))) {
-			_CompatReason = "You need the Repentance+ dlc, you currently only have Repentance installed.";
-		}
-		else {
-			_CompatReason = "You dont have a proper version or your exe is corrupted/cracked (verify your files with steam or download the specific version rgon uses)";
-		}
-	}
-
+	UpdateReason();
 	if (srgon::IsStandaloneFolder(sourcePath) && !repentogon) {
 		_gui->LogWarn("The main Isaac executable is located in a Repentogon installation, this likely indicates a broken configuration\n");
 		Logger::Error("Main Isaac executable %s is located inside a Repentogon installation", path.c_str());

src/windows/launcher.cpp

@@ -707,7 +707,7 @@ namespace Launcher {
 			.GetRepentogonInstallation().GetExePath();
 		if (repentogonPath.empty()) {
 			_repentogonFileText->SetForegroundColour(*wxRED);
-			_repentogonFileText->SetValue("No executable found");
+			_repentogonFileText->SetValue("Didnt install properly! (Incompatible?)");
 		} else {
 			_repentogonFileText->SetForegroundColour(*wxBLACK);
 			_repentogonFileText->SetValue(repentogonPath);
@@ -988,14 +988,23 @@ namespace Launcher {
 			break;
 		case ADVANCED_EVENT_REINSTALL:
 			_logWindow.Log("Attempting Repair...");
-			if (!Filesystem::SafeExists(_installation->GetIsaacInstallation().GetMainInstallation().GetFolderPath() + "Repentogon") || fs::remove_all(_installation->GetIsaacInstallation().GetMainInstallation().GetFolderPath() + "Repentogon")) {
+			if (!_installation->GetIsaacInstallation().GetRepentogonInstallation().IsCompatibleWithRepentogon()) {
+				std::string reason = _installation->GetIsaacInstallation().GetRepentogonInstallation().GetUpdatedReason();
+				_logWindow.LogError("Repair Failed!, Not compatible!. Reason: %s", reason);
+				wxMessageDialog dialog(this, "Repair Failed!, your Isaac instalation is not compatible with repentogon.\nReason: " + reason, "Incompatible Isaac Instalation!", wxOK);
+				int result = dialog.ShowModal();
+			}
+			else if (!Filesystem::SafeExists(_installation->GetIsaacInstallation().GetMainInstallation().GetFolderPath() + "Repentogon") || fs::remove_all(_installation->GetIsaacInstallation().GetMainInstallation().GetFolderPath() + "Repentogon")) {
 				ForceRepentogonUpdate(GetRepentogonUnstableUpdatesState());
 			}
 			else {
 				_logWindow.Log("Repair Failed!, Could not remove the Repentogon folder!");
 			}
 			break;
 		case ADVANCED_EVENT_FORCE_REPENTOGON_UPDATE:
+			if (!_installation->GetIsaacInstallation().GetRepentogonInstallation().IsCompatibleWithRepentogon()) {
+				_logWindow.LogWarn("Update may Fail!, Vanilla not compatible!. Reason: %s", _installation->GetIsaacInstallation().GetRepentogonInstallation().GetUpdatedReason());
+			}
 			ForceRepentogonUpdate(GetRepentogonUnstableUpdatesState());
 			break;
 

src/windows/setup_wizard.cpp

@@ -319,8 +319,8 @@ void LauncherWizard::OnPageChanged(wxWizardEvent& event) {
 
 void LauncherWizard::UpdateIsaacSetupNextButton() {
     wxWindow* button = FindWindowById(wxID_FORWARD, this);
-    if (button) {
-        button->Enable(_isaacFound);
+    if (button) { 
+        button->Enable(_isaacFound && _installation->GetIsaacInstallation().GetRepentogonInstallation().IsCompatibleWithRepentogon());
     }
 }