Просмотр исходного кода

Merge pull request #6472 from PCL-Community/fix#6451

fix(ModWatcher): Quilt 加载器错误窗口关闭后提示启动成功
龙腾猫跃 1 год назад
Родитель
Сommit
01b26cdf3c
1 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb

+ 6 - 3
Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb

@@ -271,7 +271,7 @@
                 If MinecraftWindow Is Nothing Then Return
                 Dim MinecraftWindowName = MinecraftWindow.Value.Value, MinecraftWindowHandle = MinecraftWindow.Value.Key
                 '已找到窗口
-                If Not MinecraftWindowName.StartsWithF("FML") Then
+                If Not MinecraftWindowName.StartsWithF("FML") AndAlso Not MinecraftWindowName.StartsWithF("Quilt Loader") Then
                     '已找到 Minecraft 窗口
                     WindowHandle = MinecraftWindowHandle
                     WatcherLog($"Minecraft 窗口已加载:{MinecraftWindowName}({MinecraftWindowHandle.ToInt64})")
@@ -292,8 +292,11 @@
                         End Sub, "MinecraftWindowMaximize")
                     End If
                 ElseIf Not IsWindowAppeared Then
-                    '已找到 FML 窗口
-                    WatcherLog("FML 窗口已加载:" & MinecraftWindowName & "(" & MinecraftWindowHandle.ToInt64 & ")")
+                    If (MinecraftWindowName.StartsWithF("FML")) Then '已找到 FML 窗口
+                        WatcherLog("FML 窗口已加载:" & MinecraftWindowName & "(" & MinecraftWindowHandle.ToInt64 & ")")
+                    Else '已找到 Quilt Loader 窗口
+                        WatcherLog("Quilt Loader 窗口已加载:" & MinecraftWindowName & "(" & MinecraftWindowHandle.ToInt64 & ")")
+                    End If
                 End If
                 IsWindowAppeared = True
             Catch ex As Exception