The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-24 15:41:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change timer usage for WelcomeDialog

Browse Source
This commit is contained in:
Travis Nickles 2018-01-31 00:04:56 -06:00
parent 4fe6fc6660
commit 86ee71e596
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DS4Windows/DS4Forms/WelcomeDialog.cs
View File

@ -6,7 +6,8 @@ using System.Net;
using System.IO;
using System.IO.Compression;
using System.Diagnostics;
using NonFormTimer = System.Threading.Timer;
//using NonFormTimer = System.Threading.Timer;
using NonFormTimer = System.Timers.Timer;
using System.Threading.Tasks;
using static DS4Windows.Global;
@ -78,10 +79,15 @@ namespace DS4Windows
}
catch { Process.Start(exepath + "\\Virtual Bus Driver"); }
Timer timer = new Timer();
/*Timer timer = new Timer();
timer.Start();
timer.Tick += timer_Tick;
*/
NonFormTimer timer = new NonFormTimer();
timer.Elapsed += timer_Tick;
timer.Start();
}
bool waitForFile;
DateTime waitFileCheck;
private void timer_Tick(object sender, EventArgs e)
@ -95,24 +101,27 @@ namespace DS4Windows
waitFileCheck = DateTime.UtcNow;
return;
}
if (waitForFile && waitFileCheck + TimeSpan.FromMinutes(2) < DateTime.UtcNow)
{
bnStep1.Text = Properties.Resources.InstallFailed;
Process.Start(exepath + "\\Virtual Bus Driver");
File.Delete(exepath + "\\VBus.zip");
((Timer)sender).Stop();
this.BeginInvoke((Action)(() => { bnStep1.Text = Properties.Resources.InstallFailed; }), null);
return;
}
else if (waitForFile)
return;
string log = File.ReadAllText(exepath + "\\ScpDriver.log");
if (log.Contains("Install Succeeded"))
bnStep1.Text = Properties.Resources.InstallComplete;
this.BeginInvoke((Action)(() => { bnStep1.Text = Properties.Resources.InstallComplete; }));
else
{
bnStep1.Text = Properties.Resources.InstallFailed;
this.BeginInvoke((Action)(() => { bnStep1.Text = Properties.Resources.InstallFailed; }));
Process.Start(exepath + "\\Virtual Bus Driver");
}
try
{
File.Delete(exepath + "\\ScpDriver.exe");
@ -121,12 +130,12 @@ namespace DS4Windows
Directory.Delete(exepath + "\\DIFxAPI", true);
}
catch { }
File.Delete(exepath + "\\VBus.zip");
((Timer)sender).Stop();
}
}
private void button2_Click(object sender, EventArgs e)
{
Process.Start("http://www.microsoft.com/accessories/en-gb/d/xbox-360-controller-for-windows");