The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-26 19:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay

Browse Source
This commit is contained in:
mika-n 2019-05-28 12:24:44 +03:00
commit 93bd802dc1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DS4Windows/DS4Forms/WelcomeDialog.cs
View File

@ -19,6 +19,8 @@ namespace DS4Windows.Forms
"https://github.com/ViGEm/ViGEmBus/releases/download/v1.16.112/ViGEmBus_Setup_1.16.115.exe"; "https://github.com/ViGEm/ViGEmBus/releases/download/v1.16.112/ViGEmBus_Setup_1.16.115.exe";
private const string InstFileName = "ViGEmBus_Setup_1.16.115.exe"; private const string InstFileName = "ViGEmBus_Setup_1.16.115.exe";
Process monitorProc;
public WelcomeDialog(bool loadConfig=false) public WelcomeDialog(bool loadConfig=false)
{ {
if (loadConfig) if (loadConfig)
@ -71,7 +73,7 @@ namespace DS4Windows.Forms
if (File.Exists(exepath + $"\\{InstFileName}")) if (File.Exists(exepath + $"\\{InstFileName}"))
{ {
bnStep1.Text = Properties.Resources.OpeningInstaller; bnStep1.Text = Properties.Resources.OpeningInstaller;
Process.Start(exepath + $"\\{InstFileName}", "/quiet"); monitorProc = Process.Start(exepath + $"\\{InstFileName}", "/quiet");
bnStep1.Text = Properties.Resources.Installing; bnStep1.Text = Properties.Resources.Installing;
} }
@ -82,8 +84,7 @@ namespace DS4Windows.Forms
private void timer_Tick(object sender, EventArgs e) private void timer_Tick(object sender, EventArgs e)
{ {
Process[] processes = Process.GetProcessesByName("ViGEmBus_Setup_1.16.112"); if (monitorProc != null && monitorProc.HasExited)
if (processes.Length < 1)
{ {
if (Global.IsViGEmBusInstalled()) if (Global.IsViGEmBusInstalled())
{ {