Now it is not possible for user to use ALT+F4 to close the updater wh…

…en mandatory mode is Forced or ForcedDownload.
zzwwg · Aug 4, 2020 · a6b7f74 · a6b7f74
1 parent f07d5da
commit a6b7f74
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/AutoUpdater.NET/DownloadUpdateDialog.cs b/AutoUpdater.NET/DownloadUpdateDialog.cs
@@ -215,6 +215,8 @@ private void WebClientOnDownloadFileCompleted(object sender, AsyncCompletedEvent
             }
             finally
             {
+                DialogResult = _webClient == null ? DialogResult.Cancel : DialogResult.OK;
+                FormClosing -= DownloadUpdateDialog_FormClosing;
                 Close();
             }
         }
@@ -255,19 +257,19 @@ private static void CompareChecksum(string fileName, CheckSum checksum)
 
         private void DownloadUpdateDialog_FormClosing(object sender, FormClosingEventArgs e)
         {
-            if (_webClient == null)
+            if (AutoUpdater.Mandatory && AutoUpdater.UpdateMode == Mode.ForcedDownload)
             {
-                DialogResult = DialogResult.Cancel;
+                if (e.CloseReason == CloseReason.UserClosing)
+                {
+                    e.Cancel = true;
+                    return;
+                }
             }
-            else if (_webClient.IsBusy)
+            if (_webClient != null && _webClient.IsBusy)
             {
                 _webClient.CancelAsync();
                 DialogResult = DialogResult.Cancel;
             }
-            else
-            {
-                DialogResult = DialogResult.OK;
-            }
         }
     }
 }
diff --git a/AutoUpdater.NET/UpdateForm.Designer.cs b/AutoUpdater.NET/UpdateForm.Designer.cs
diff --git a/AutoUpdater.NET/UpdateForm.cs b/AutoUpdater.NET/UpdateForm.cs
@@ -178,5 +178,13 @@ private void UpdateForm_FormClosed(object sender, FormClosedEventArgs e)
         {
             AutoUpdater.Running = false;
         }
+
+        private void UpdateForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (AutoUpdater.Mandatory && AutoUpdater.UpdateMode == Mode.Forced)
+            {
+                e.Cancel = e.CloseReason == CloseReason.UserClosing;
+            }
+        }
     }
 }