Merge pull request #9198 from Howard302/feature/esc-cancel-launch

feat: 在启动页面按 Esc 取消启动游戏
2026-09-03 21:39:12 +08:00
parent 06125e2b89 7c75fe4d4b
commit 8f76864574
3 changed files with 28 additions and 15 deletions
@@ -692,19 +692,7 @@ ExitRefresh:
    End Sub
    '取消按钮
    Private Sub BtnCancel_Click() Handles BtnCancel.Click
-        If McLaunchLoaderReal IsNot Nothing Then
-            McLaunchLoaderReal.Cancel()
-            McLaunchLog("已取消启动")
-            Try
-                If McLaunchWatcher IsNot Nothing Then
-                    McLaunchWatcher.Kill()
-                ElseIf McLaunchProcess IsNot Nothing Then
-                    If Not McLaunchProcess.HasExited Then McLaunchProcess.Kill()
-                End If
-            Catch ex As Exception
-                Logger.Error(ex, "取消启动结束进程失败", LogBehavior.Toast)
-            End Try
-        End If
+        McLaunchCancel()
    End Sub
    '版本设置按钮
    Private Sub BtnMore_Click() Handles BtnMore.Click