diff --git a/CreamInstaller/Forms/InstallForm.cs b/CreamInstaller/Forms/InstallForm.cs index 2bdf354..5eeea56 100644 --- a/CreamInstaller/Forms/InstallForm.cs +++ b/CreamInstaller/Forms/InstallForm.cs @@ -195,7 +195,7 @@ internal sealed partial class InstallForm : CustomForm completeOperationsCount = 0; foreach (ProgramSelection selection in programSelections) { - if (Program.Canceled || !Program.IsProgramRunningDialog(this, selection)) + if (Program.Canceled || !Program.AreDllsLockedDialog(this, selection)) throw new CustomMessageException("The operation was canceled."); try { diff --git a/CreamInstaller/Forms/SelectForm.cs b/CreamInstaller/Forms/SelectForm.cs index 46f6079..e13ebb4 100644 --- a/CreamInstaller/Forms/SelectForm.cs +++ b/CreamInstaller/Forms/SelectForm.cs @@ -1002,7 +1002,7 @@ internal sealed partial class SelectForm : CustomForm { if (!ProgramSelection.All.Any()) return; - if (ProgramSelection.AllEnabled.Any(selection => !Program.IsProgramRunningDialog(this, selection))) + if (ProgramSelection.AllEnabled.Any(selection => !Program.AreDllsLockedDialog(this, selection))) return; if (!uninstall && ParadoxLauncher.DlcDialog(this)) return; diff --git a/CreamInstaller/Platforms/Paradox/ParadoxLauncher.cs b/CreamInstaller/Platforms/Paradox/ParadoxLauncher.cs index 202db6d..5953443 100644 --- a/CreamInstaller/Platforms/Paradox/ParadoxLauncher.cs +++ b/CreamInstaller/Platforms/Paradox/ParadoxLauncher.cs @@ -79,8 +79,8 @@ internal static class ParadoxLauncher internal static async Task Repair(Form form, ProgramSelection selection) { InstallForm installForm = form as InstallForm; - if (!Program.IsProgramRunningDialog(form, selection)) - return form is InstallForm ? throw new CustomMessageException("Repair failed! The launcher is currently running!") : RepairResult.ProgramRunning; + if (!Program.AreDllsLockedDialog(form, selection)) + return form is InstallForm ? throw new CustomMessageException("Repair failed! One or more DLLs crucial to unlocker installation are locked!") : RepairResult.ProgramRunning; bool smokeInstalled = false; byte[] steamOriginalSdk32 = null; byte[] steamOriginalSdk64 = null; diff --git a/CreamInstaller/Program.cs b/CreamInstaller/Program.cs index d5b691f..1ccf65a 100644 --- a/CreamInstaller/Program.cs +++ b/CreamInstaller/Program.cs @@ -50,7 +50,7 @@ internal static class Program return ProtectedGameDirectories.Any(path => (directory + path).DirectoryExists()); } - internal static bool IsProgramRunningDialog(Form form, ProgramSelection selection) + internal static bool AreDllsLockedDialog(Form form, ProgramSelection selection) { while (true) {