jonny_bro/CreamInstaller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more string clarifications

Browse source
This commit is contained in:
pointfeev 2023-03-28 00:36:37 -04:00
parent c74d597a7a
commit cd386ea951
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CreamInstaller/Forms/InstallForm.cs
View file

@ -195,7 +195,7 @@ internal sealed partial class InstallForm : CustomForm
completeOperationsCount = 0; completeOperationsCount = 0;
foreach (ProgramSelection selection in programSelections) 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."); throw new CustomMessageException("The operation was canceled.");
try try
{ {

2
CreamInstaller/Forms/SelectForm.cs
View file

@ -1002,7 +1002,7 @@ internal sealed partial class SelectForm : CustomForm
{ {
if (!ProgramSelection.All.Any()) if (!ProgramSelection.All.Any())
return; return;
if (ProgramSelection.AllEnabled.Any(selection => !Program.IsProgramRunningDialog(this, selection))) if (ProgramSelection.AllEnabled.Any(selection => !Program.AreDllsLockedDialog(this, selection)))
return; return;
if (!uninstall && ParadoxLauncher.DlcDialog(this)) if (!uninstall && ParadoxLauncher.DlcDialog(this))
return; return;

4
CreamInstaller/Platforms/Paradox/ParadoxLauncher.cs
View file

@ -79,8 +79,8 @@ internal static class ParadoxLauncher
internal static async Task<RepairResult> Repair(Form form, ProgramSelection selection) internal static async Task<RepairResult> Repair(Form form, ProgramSelection selection)
{ {
InstallForm installForm = form as InstallForm; InstallForm installForm = form as InstallForm;
if (!Program.IsProgramRunningDialog(form, selection)) if (!Program.AreDllsLockedDialog(form, selection))
return form is InstallForm ? throw new CustomMessageException("Repair failed! The launcher is currently running!") : RepairResult.ProgramRunning; return form is InstallForm ? throw new CustomMessageException("Repair failed! One or more DLLs crucial to unlocker installation are locked!") : RepairResult.ProgramRunning;
bool smokeInstalled = false; bool smokeInstalled = false;
byte[] steamOriginalSdk32 = null; byte[] steamOriginalSdk32 = null;
byte[] steamOriginalSdk64 = null; byte[] steamOriginalSdk64 = null;

2
CreamInstaller/Program.cs
View file

@ -50,7 +50,7 @@ internal static class Program
return ProtectedGameDirectories.Any(path => (directory + path).DirectoryExists()); 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) while (true)
{ {