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

fixes for uninstall all cancellation

Browse source
This commit is contained in:
pointfeev 2023-03-02 14:47:52 -05:00
parent a7b8e893b2
commit 252db9c775
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
CreamInstaller/Forms/SelectForm.cs
View file

@ -645,23 +645,22 @@ internal sealed partial class SelectForm : CustomForm
progressBar.Value = p; progressBar.Value = p;
}; };
progressLabel.Text = "Quickly gathering games for uninstallation . . . "; progressLabel.Text = "Quickly gathering games for uninstallation . . . ";
if (!Program.Canceled) TreeNodes.ForEach(node => node.Remove());
await GetApplicablePrograms(iProgress, true); await GetApplicablePrograms(iProgress, true);
if (!Program.Canceled) if (!Program.Canceled)
OnUninstall(null, null); OnUninstall(null, null);
ProgramSelection.All.Clear();
} }
else else
{
scan = selectResult == DialogResult.OK && choices is not null && choices.Any(); scan = selectResult == DialogResult.OK && choices is not null && choices.Any();
const string retry = "\n\nPress the \"Rescan\" button to re-choose."; const string retry = "\n\nPress the \"Rescan\" button to re-choose.";
if (scan) if (scan)
{ {
programsToScan = choices; programsToScan = choices;
noneFoundLabel.Text = "None of the chosen programs nor games were applicable!" + retry; noneFoundLabel.Text = "None of the chosen programs nor games were applicable!" + retry;
}
else
noneFoundLabel.Text = "You didn't choose any programs nor games!" + retry;
} }
else
noneFoundLabel.Text = "You didn't choose any programs nor games!" + retry;
} }
else else
noneFoundLabel.Text = "No applicable programs nor games were found on your computer!"; noneFoundLabel.Text = "No applicable programs nor games were found on your computer!";
@ -697,15 +696,7 @@ internal sealed partial class SelectForm : CustomForm
setup = false; setup = false;
progressLabel.Text = "Gathering and caching your applicable games and their DLCs . . . "; progressLabel.Text = "Gathering and caching your applicable games and their DLCs . . . ";
ProgramSelection.ValidateAll(programsToScan); ProgramSelection.ValidateAll(programsToScan);
/*TreeNodes.ForEach(node => TreeNodes.ForEach(node => node.Remove());
{
if (node.Tag is not Platform platform
|| node.Name is not string platformId
|| ProgramSelection.FromPlatformId(platform, platformId) is null
&& ProgramSelection.GetDlcFromPlatformId(platform, platformId) is null)
node.Remove();
});*/
TreeNodes.ForEach(node => node.Remove()); // nodes cause lots of lag during rescan for now
await GetApplicablePrograms(iProgress); await GetApplicablePrograms(iProgress);
await SteamCMD.Cleanup(); await SteamCMD.Cleanup();
} }