The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-26 02:54: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-07-12 00:01:13 +03:00
commit 08779ba1cd
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -665,6 +665,11 @@ namespace DS4Windows.Forms
Program.rootHub.suspending = true; Program.rootHub.suspending = true;
this.Invoke((System.Action)(() => BtnStartStop_Clicked())); this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
wasrunning = true; wasrunning = true;
while (this.changingService)
{
Thread.SpinWait(500);
}
} }
break; break;
@ -927,12 +932,14 @@ namespace DS4Windows.Forms
FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location); FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
string version = fvi.FileVersion; string version = fvi.FileVersion;
string newversion = File.ReadAllText(appdatapath + "\\version.txt").Trim(); string newversion = File.ReadAllText(appdatapath + "\\version.txt").Trim();
bool launchUpdate = false;
if (!string.IsNullOrWhiteSpace(newversion) && version.Replace(',', '.').CompareTo(newversion) != 0) if (!string.IsNullOrWhiteSpace(newversion) && version.Replace(',', '.').CompareTo(newversion) != 0)
{ {
if ((DialogResult)this.Invoke(new Func<DialogResult>(() => { if ((DialogResult)this.Invoke(new Func<DialogResult>(() => {
return MessageBox.Show(Properties.Resources.DownloadVersion.Replace("*number*", newversion), return MessageBox.Show(Properties.Resources.DownloadVersion.Replace("*number*", newversion),
Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question); })) == DialogResult.Yes) Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question); })) == DialogResult.Yes)
{ {
launchUpdate = true;
if (!File.Exists(exepath + "\\DS4Updater.exe") || (File.Exists(exepath + "\\DS4Updater.exe") if (!File.Exists(exepath + "\\DS4Updater.exe") || (File.Exists(exepath + "\\DS4Updater.exe")
&& (FileVersionInfo.GetVersionInfo(exepath + "\\DS4Updater.exe").FileVersion.CompareTo(UPDATER_VERSION) != 0))) && (FileVersionInfo.GetVersionInfo(exepath + "\\DS4Updater.exe").FileVersion.CompareTo(UPDATER_VERSION) != 0)))
{ {
@ -941,6 +948,17 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
if (appdatapath == exepath) if (appdatapath == exepath)
{ {
wc2.DownloadFile(url2, exepath + "\\DS4Updater.exe"); wc2.DownloadFile(url2, exepath + "\\DS4Updater.exe");
}
else
{
this.BeginInvoke((System.Action)(() => MessageBox.Show(Properties.Resources.PleaseDownloadUpdater)));
Process.Start($"https://github.com/Ryochan7/DS4Updater/releases/download/v{UPDATER_VERSION}/{updaterExe}");
launchUpdate = false;
}
}
if (launchUpdate)
{
Process p = new Process(); Process p = new Process();
p.StartInfo.FileName = exepath + "\\DS4Updater.exe"; p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
p.StartInfo.Arguments = "-autolaunch"; p.StartInfo.Arguments = "-autolaunch";
@ -950,12 +968,6 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
try { p.Start(); Close(); } try { p.Start(); Close(); }
catch { } catch { }
} }
else
{
this.BeginInvoke((System.Action)(() => MessageBox.Show(Properties.Resources.PleaseDownloadUpdater)));
Process.Start($"https://github.com/Ryochan7/DS4Updater/releases/download/v{UPDATER_VERSION}/{updaterExe}");
}
}
} }
else else
File.Delete(appdatapath + "\\version.txt"); File.Delete(appdatapath + "\\version.txt");

4
DS4Windows/Properties/AssemblyInfo.cs
View File

@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.11")] [assembly: AssemblyVersion("1.7.12")]
[assembly: AssemblyFileVersion("1.7.11")] [assembly: AssemblyFileVersion("1.7.12")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]

2
DS4Windows/newest.txt
View File

@ -1 +1 @@
1.7.11 1.7.12

1
TODO.md
View File

@ -2,6 +2,7 @@
* Add cross dead zone (per axis) for sticks * Add cross dead zone (per axis) for sticks
* Add more curve options * Add more curve options
* Transition to use Visual Studio 2019
* ~~Re-evaluate HidGuardian~~ * ~~Re-evaluate HidGuardian~~
* ~~Move forms to new namespace~~ * ~~Move forms to new namespace~~
* ~~Finalize DS4 Emulation~~ * ~~Finalize DS4 Emulation~~

1
contributors.txt
View File

@ -4,6 +4,7 @@ Korney Czukowski (czukowski)
DandelionSprout DandelionSprout
jdfeng jdfeng
justalemon justalemon
Kamilczak020
mika-n mika-n
Rajko Stojadinovic (rajkosto) Rajko Stojadinovic (rajkosto)
Sander0542 Sander0542