From 5e3740451dcae40d354ea8da1cd1cf5515a95203 Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Thu, 22 Dec 2022 20:41:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=99=A8=E5=A4=B1=E8=B4=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/MaaWpfGui.csproj          |  11 +++
 src/MaaWpfGui/Main/SettingsViewModel.cs | 100 +++++++++++++++---------
 2 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj
index 1508a6ac98..5eb73cc54d 100644
--- a/src/MaaWpfGui/MaaWpfGui.csproj
+++ b/src/MaaWpfGui/MaaWpfGui.csproj
@@ -495,6 +495,17 @@
   <ItemGroup>
     <Resource Include="newlogo.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="IWshRuntimeLibrary">
+      <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>xcopy /e /y /i /c "$(ProjectDir)..\..\3rdparty\tools" "$(TargetDir)"
diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs
index 262c353223..dffc2fb561 100644
--- a/src/MaaWpfGui/Main/SettingsViewModel.cs
+++ b/src/MaaWpfGui/Main/SettingsViewModel.cs
@@ -21,8 +21,8 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using IWshRuntimeLibrary;
 using MaaWpfGui.MaaHotKeys;
-using Newtonsoft.Json.Linq;
 using Stylet;
 using StyletIoC;
 
@@ -402,46 +402,74 @@ namespace MaaWpfGui
         public void TryToStartEmulator(bool manual = false)
         {
             if ((EmulatorPath.Length == 0
-                || !File.Exists(EmulatorPath))
+                || !System.IO.File.Exists(EmulatorPath))
                 || !(StartEmulator
                 || manual))
             {
                 return;
             }
 
-            ProcessStartInfo startInfo;
-            if (EmulatorAddCommand.Length != 0)
-            {
-                startInfo = new ProcessStartInfo(EmulatorPath, EmulatorAddCommand);
-            }
-            else
-            {
-                startInfo = new ProcessStartInfo(EmulatorPath);
-            }
-
-            startInfo.UseShellExecute = false;
-            Process process = new Process
-            {
-                StartInfo = startInfo,
-            };
-
-            process.Start();
-            process.WaitForInputIdle();
-            if (MinimizingStartup)
-            {
-                for (int i = 0; !IsIconic(process.MainWindowHandle) && i < 5000; ++i)
-                {
-                    ShowWindow(process.MainWindowHandle, SWMINIMIZE);
-                    Thread.Sleep(1);
-                }
-            }
-
             if (!int.TryParse(EmulatorWaitSeconds, out int delay))
             {
                 delay = 60;
             }
 
-            Thread.Sleep(delay * 1000);
+            try
+            {
+                string fileName;
+                string arguments;
+                ProcessStartInfo startInfo;
+
+                if (Path.GetExtension(EmulatorPath).ToLower() == ".lnk")
+                {
+                    WshShell shell = new WshShell();
+                    WshShortcut shortcut = (WshShortcut)shell.CreateShortcut(EmulatorPath);
+                    fileName = shortcut.TargetPath;
+                    arguments = shortcut.Arguments;
+                }
+                else
+                {
+                    fileName = EmulatorPath;
+                    arguments = EmulatorAddCommand;
+                }
+
+                if (arguments.Length != 0)
+                {
+                    startInfo = new ProcessStartInfo(fileName, arguments);
+                }
+                else
+                {
+                    startInfo = new ProcessStartInfo(fileName);
+                }
+
+                startInfo.UseShellExecute = false;
+                Process process = new Process
+                {
+                    StartInfo = startInfo,
+                };
+                process.Start();
+                process.WaitForInputIdle();
+                if (MinimizingStartup)
+                {
+                    for (int i = 0; !IsIconic(process.MainWindowHandle) && i < delay * 1000; ++i)
+                    {
+                        ShowWindow(process.MainWindowHandle, SWMINIMIZE);
+                        Thread.Sleep(1);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                if (EmulatorAddCommand.Length != 0)
+                {
+                    Process.Start(EmulatorPath);
+                }
+                else
+                {
+                    Process.Start(EmulatorPath, EmulatorAddCommand);
+                    Thread.Sleep(delay * 1000);
+                }
+            }
         }
 
         /// <summary>
@@ -1934,13 +1962,13 @@ namespace MaaWpfGui
                 return;
             }
 
-            if (!File.Exists(_bluestacksConfig))
+            if (!System.IO.File.Exists(_bluestacksConfig))
             {
                 ViewStatusStorage.Set("Bluestacks.Config.Error", "File not exists");
                 return;
             }
 
-            var all_lines = File.ReadAllLines(_bluestacksConfig);
+            var all_lines = System.IO.File.ReadAllLines(_bluestacksConfig);
             foreach (var line in all_lines)
             {
                 if (line.StartsWith(_bluestacksKeyWord))
@@ -1981,7 +2009,7 @@ namespace MaaWpfGui
 
         public async void ReplaceADB()
         {
-            if (!File.Exists(AdbPath))
+            if (!System.IO.File.Exists(AdbPath))
             {
                 Execute.OnUIThread(() =>
                 {
@@ -1993,7 +2021,7 @@ namespace MaaWpfGui
                 return;
             }
 
-            if (!File.Exists(GoogleAdbFilename))
+            if (!System.IO.File.Exists(GoogleAdbFilename))
             {
                 var downloadTask = Task.Run(() =>
                 {
@@ -2022,7 +2050,7 @@ namespace MaaWpfGui
                    process.Kill();
                }
 
-               File.Copy(AdbPath, AdbPath + ".bak", true);
+               System.IO.File.Copy(AdbPath, AdbPath + ".bak", true);
 
                const string UnzipDir = "adb_unzip";
                if (Directory.Exists(UnzipDir))
@@ -2031,7 +2059,7 @@ namespace MaaWpfGui
                }
 
                System.IO.Compression.ZipFile.ExtractToDirectory(GoogleAdbFilename, UnzipDir);
-               File.Copy(UnzipDir + "/platform-tools/adb.exe", AdbPath, true);
+               System.IO.File.Copy(UnzipDir + "/platform-tools/adb.exe", AdbPath, true);
                Directory.Delete(UnzipDir, true);
            });
             await procTask;