Merge pull request #5912 from LuoYun-Team/uac

fix:为可能出错的部分加个 Try Catch
This commit is contained in:
龙腾猫跃
2025-04-25 19:15:46 +08:00
committed by GitHub
2 changed files with 11 additions and 3 deletions
@@ -858,6 +858,7 @@ NextStack:
"确定", If(IsHandAnalyze OrElse DirectFile Is Nothing, "", "查看日志"), If(IsHandAnalyze, "", "导出错误报告"), "确定", If(IsHandAnalyze OrElse DirectFile Is Nothing, "", "查看日志"), If(IsHandAnalyze, "", "导出错误报告"),
Button2Action:=If(IsHandAnalyze OrElse DirectFile Is Nothing, Nothing, Button2Action:=If(IsHandAnalyze OrElse DirectFile Is Nothing, Nothing,
Sub() Sub()
Try
'弹窗选择:查看日志 '弹窗选择:查看日志
If File.Exists(DirectFile.Value.Key) Then If File.Exists(DirectFile.Value.Key) Then
ShellOnly(DirectFile.Value.Key) ShellOnly(DirectFile.Value.Key)
@@ -866,6 +867,9 @@ NextStack:
WriteFile(FilePath, Join(DirectFile.Value.Value, vbCrLf)) WriteFile(FilePath, Join(DirectFile.Value.Value, vbCrLf))
ShellOnly(FilePath) ShellOnly(FilePath)
End If End If
Catch ex As Exception
Log(ex,"尝试打开文件失败",LogLevel.Hint)
End Try
End Sub)) End Sub))
Case 3 Case 3
'弹窗选择:导出错误报告 '弹窗选择:导出错误报告
@@ -830,9 +830,13 @@ Retry:
Log("[Modpack] 找到压缩包中附带的启动器:" & Launcher) Log("[Modpack] 找到压缩包中附带的启动器:" & Launcher)
If MyMsgBox($"整合包里似乎自带了启动器,是否换用它继续安装?{vbCrLf}即将打开:{Launcher}", "换用整合包启动器?", "换用", "不换用") = 1 Then If MyMsgBox($"整合包里似乎自带了启动器,是否换用它继续安装?{vbCrLf}即将打开:{Launcher}", "换用整合包启动器?", "换用", "不换用") = 1 Then
OpenExplorer(TargetFolder) OpenExplorer(TargetFolder)
Try
ShellOnly(Launcher, "--wait") '要求等待已有的 PCL 退出 ShellOnly(Launcher, "--wait") '要求等待已有的 PCL 退出
Log("[Modpack] 为换用整合包中的启动器启动,强制结束程序") Log("[Modpack] 为换用整合包中的启动器启动,强制结束程序")
FrmMain.EndProgram(False) FrmMain.EndProgram(False)
Catch ex As Exception
Log(ex, "打开文件失败", LogLevel.Msgbox)
End Try
Return Return
End If End If
Else Else