1
0
Эх сурвалжийг харах

fix(MyMsgInput):validate 输入

不要相信用户输入

薄奚梦灵 1 жил өмнө
parent
commit
92eeba5fff

+ 1 - 0
Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb

@@ -72,6 +72,7 @@
     End Sub
     End Sub
 
 
     Public Sub Btn1_Click() Handles Btn1.Click
     Public Sub Btn1_Click() Handles Btn1.Click
+        TextArea.Validate()
         If MyConverter.IsExited OrElse Not TextArea.ValidateResult = "" Then Exit Sub
         If MyConverter.IsExited OrElse Not TextArea.ValidateResult = "" Then Exit Sub
         MyConverter.IsExited = True
         MyConverter.IsExited = True
         MyConverter.Result = TextArea.Text
         MyConverter.Result = TextArea.Text

+ 0 - 11
Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb

@@ -125,17 +125,6 @@ ReType:
                 Log(ex, "重命名读取 json 时失败")
                 Log(ex, "重命名读取 json 时失败")
                 JsonObject = PageVersionLeft.Version.JsonObject
                 JsonObject = PageVersionLeft.Version.JsonObject
             End Try
             End Try
-            If Directory.Exists(NewPath) OrElse Directory.Exists(TempName) Then
-                Select Case MyMsgBox("当前文件夹已存在此名称,请重新输入一个有效的名称。", "重命名失败", Button1:="确定", Button2:="取消")
-                    Case 1
-                        GoTo ReType
-                    Case 2
-                        Exit Sub
-                End Select
-            ElseIf Not Directory.Exists($"{PathMcFolder}\versions") Then
-                MyMsgBox("当前版本文件夹无效,请检查版本文件夹。", "重命名失败")
-                Exit Sub
-            End If
             '重命名主文件夹
             '重命名主文件夹
             My.Computer.FileSystem.RenameDirectory(OldPath, TempName)
             My.Computer.FileSystem.RenameDirectory(OldPath, TempName)
             My.Computer.FileSystem.RenameDirectory(TempPath, NewName)
             My.Computer.FileSystem.RenameDirectory(TempPath, NewName)