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

Preserve refactor

Browse Source
This commit is contained in:
Travis Nickles 2017-07-03 01:24:54 -07:00
parent 089383b64e
commit 001f2e5432
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
DS4Windows/Program.cs
View File

@ -96,21 +96,22 @@ namespace DS4Windows
// Create the Event handle // Create the Event handle
threadComEvent = new EventWaitHandle(false, EventResetMode.AutoReset, SingleAppComEventName); threadComEvent = new EventWaitHandle(false, EventResetMode.AutoReset, SingleAppComEventName);
CreateInterAppComThread(); //CreateInterAppComThread();
if (mutex.WaitOne(TimeSpan.Zero, true)) //if (mutex.WaitOne(TimeSpan.Zero, true))
{ //{
rootHub = new ControlService(); rootHub = new ControlService();
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new DS4Form(args)); Application.Run(new DS4Form(args));
mutex.ReleaseMutex(); //mutex.ReleaseMutex();
} //}
// End the communication thread. // End the communication thread.
singleAppComThread.CancelAsync(); //singleAppComThread.CancelAsync();
while (singleAppComThread.IsBusy) //threadComEvent.Set(); // signal the other instance.
Thread.Sleep(50); //while (singleAppComThread.IsBusy)
// Thread.Sleep(50);
threadComEvent.Close(); threadComEvent.Close();
} }
@ -120,7 +121,7 @@ namespace DS4Windows
singleAppComThread.WorkerReportsProgress = false; singleAppComThread.WorkerReportsProgress = false;
singleAppComThread.WorkerSupportsCancellation = true; singleAppComThread.WorkerSupportsCancellation = true;
singleAppComThread.DoWork += new DoWorkEventHandler(singleAppComThread_DoWork); singleAppComThread.DoWork += new DoWorkEventHandler(singleAppComThread_DoWork);
singleAppComThread.RunWorkerAsync(); //singleAppComThread.RunWorkerAsync();
} }
static private void singleAppComThread_DoWork(object sender, DoWorkEventArgs e) static private void singleAppComThread_DoWork(object sender, DoWorkEventArgs e)
@ -132,12 +133,12 @@ namespace DS4Windows
while (!worker.CancellationPending) while (!worker.CancellationPending)
{ {
// check every second for a signal. // check every second for a signal.
if (WaitHandle.WaitAny(waitHandles, 1000) == 0) if (WaitHandle.WaitAny(waitHandles) == 0)
{ {
// The user tried to start another instance. We can't allow that, // The user tried to start another instance. We can't allow that,
// so bring the other instance back into view and enable that one. // so bring the other instance back into view and enable that one.
// That form is created in another thread, so we need some thread sync magic. // That form is created in another thread, so we need some thread sync magic.
if (Application.OpenForms.Count > 0) if (!worker.CancellationPending && Application.OpenForms.Count > 0)
{ {
Form mainForm = Application.OpenForms[0]; Form mainForm = Application.OpenForms[0];
mainForm.Invoke(new SetFormVisableDelegate(ThreadFormVisable), mainForm); mainForm.Invoke(new SetFormVisableDelegate(ThreadFormVisable), mainForm);