From 7c0c8883b5ef5ae11ecef78ef7c817c749d4e10c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 13 Apr 2024 12:43:49 +0200 Subject: [PATCH] Reduced code complexity in PS_ExecuteNow_Click() private method. --- src/srcrepair/FrmMainW.cs | 55 ++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/src/srcrepair/FrmMainW.cs b/src/srcrepair/FrmMainW.cs index 8f170b34..11c131b7 100644 --- a/src/srcrepair/FrmMainW.cs +++ b/src/srcrepair/FrmMainW.cs @@ -1771,47 +1771,44 @@ private void PS_CleanRegistry_CheckedChanged(object sender, EventArgs e) /// Event arguments. private void PS_ExecuteNow_Click(object sender, EventArgs e) { - if (MessageBox.Show(AppStrings.PS_ExecuteMSG, Properties.Resources.AppName, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes) + if ((PS_CleanBlobs.Checked || PS_CleanRegistry.Checked) && MessageBox.Show(AppStrings.PS_ExecuteMSG, Properties.Resources.AppName, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes) { - if (PS_CleanBlobs.Checked || PS_CleanRegistry.Checked) + if (ProcessManager.ProcessTerminate("Steam") != 0) { - if (ProcessManager.ProcessTerminate("Steam") != 0) + MessageBox.Show(AppStrings.PS_ProcessDetected, Properties.Resources.AppName, MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + + if (PS_CleanBlobs.Checked) + { + try { - MessageBox.Show(AppStrings.PS_ProcessDetected, Properties.Resources.AppName, MessageBoxButtons.OK, MessageBoxIcon.Warning); + App.SteamClient.CleanBlobsNow(); } - - if (PS_CleanBlobs.Checked) + catch (Exception Ex) { - try - { - App.SteamClient.CleanBlobsNow(); - } - catch (Exception Ex) - { - Logger.Error(Ex, DebugStrings.AppDbgExClnBlobs); - MessageBox.Show(AppStrings.PS_CleanException, Properties.Resources.AppName, MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + Logger.Error(Ex, DebugStrings.AppDbgExClnBlobs); + MessageBox.Show(AppStrings.PS_CleanException, Properties.Resources.AppName, MessageBoxButtons.OK, MessageBoxIcon.Warning); } + } - if (PS_CleanRegistry.Checked) + if (PS_CleanRegistry.Checked) + { + try { - try - { - App.SteamClient.CleanRegistryNow(PS_SteamLang.SelectedIndex); - } - catch (Exception Ex) - { - Logger.Error(Ex, DebugStrings.AppDbgExClnReg); - MessageBox.Show(AppStrings.PS_CleanException, Properties.Resources.AppName, MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + App.SteamClient.CleanRegistryNow(PS_SteamLang.SelectedIndex); } - - MessageBox.Show(AppStrings.PS_SeqCompleted, Properties.Resources.AppName, MessageBoxButtons.OK, MessageBoxIcon.Information); - if (File.Exists(Path.Combine(App.SteamClient.FullSteamPath, App.Platform.SteamBinaryName))) + catch (Exception Ex) { - App.Platform.StartRegularProcess(Path.Combine(App.SteamClient.FullSteamPath, App.Platform.SteamBinaryName)); + Logger.Error(Ex, DebugStrings.AppDbgExClnReg); + MessageBox.Show(AppStrings.PS_CleanException, Properties.Resources.AppName, MessageBoxButtons.OK, MessageBoxIcon.Warning); } } + + MessageBox.Show(AppStrings.PS_SeqCompleted, Properties.Resources.AppName, MessageBoxButtons.OK, MessageBoxIcon.Information); + if (File.Exists(Path.Combine(App.SteamClient.FullSteamPath, App.Platform.SteamBinaryName))) + { + App.Platform.StartRegularProcess(Path.Combine(App.SteamClient.FullSteamPath, App.Platform.SteamBinaryName)); + } } }