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

Merge branch 'jay' into vigem-udpserver

Browse Source
This commit is contained in:
Travis Nickles 2018-08-11 02:40:18 -05:00
commit ea159ebe4b
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -290,6 +290,7 @@ namespace DS4Windows
autoProfilesTimer.Elapsed += CheckAutoProfiles; autoProfilesTimer.Elapsed += CheckAutoProfiles;
autoProfilesTimer.Interval = 1000; autoProfilesTimer.Interval = 1000;
autoProfilesTimer.AutoReset = false;
FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location); FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
string version = fvi.FileVersion; string version = fvi.FileVersion;
@ -310,6 +311,7 @@ namespace DS4Windows
btnStartStop.Text = Properties.Resources.StartText; btnStartStop.Text = Properties.Resources.StartText;
hotkeysTimer.Elapsed += Hotkeys; hotkeysTimer.Elapsed += Hotkeys;
hotkeysTimer.AutoReset = false;
if (SwipeProfiles) if (SwipeProfiles)
{ {
hotkeysTimer.Start(); hotkeysTimer.Start();
@ -600,6 +602,8 @@ namespace DS4Windows
bat = null; bat = null;
runningBat = false; runningBat = false;
} }
hotkeysTimer.Start();
} }
private void CheckAutoProfiles(object sender, EventArgs e) private void CheckAutoProfiles(object sender, EventArgs e)
@ -676,6 +680,7 @@ namespace DS4Windows
} }
} }
autoProfilesTimer.Start();
//GC.Collect(); //GC.Collect();
} }
@ -926,14 +931,14 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
protected void Form_Resize(object sender, EventArgs e) protected void Form_Resize(object sender, EventArgs e)
{ {
bool minToTask = GetMinToTaskbar(); bool minToTask = GetMinToTaskbar();
if (FormWindowState.Minimized == WindowState && minToTask) if (FormWindowState.Minimized == WindowState && !minToTask)
{ {
Hide(); Hide();
ShowInTaskbar = false; ShowInTaskbar = false;
FormBorderStyle = FormBorderStyle.None; FormBorderStyle = FormBorderStyle.None;
} }
else if (FormWindowState.Normal == WindowState && minToTask) else if (FormWindowState.Normal == WindowState && !minToTask)
{ {
//mAllowVisible = true; //mAllowVisible = true;
Show(); Show();
@ -2582,8 +2587,12 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
private async void WaitUDPPortChange() private async void WaitUDPPortChange()
{ {
await TaskRunner.Run(() => Program.rootHub.UseUDPPort()); await TaskRunner.Delay(100);
nUDUdpPortNum.Enabled = true; if (isUsingUDPServer())
{
await TaskRunner.Run(() => Program.rootHub.UseUDPPort());
nUDUdpPortNum.Enabled = true;
}
} }
private void cBFlashWhenLate_CheckedChanged(object sender, EventArgs e) private void cBFlashWhenLate_CheckedChanged(object sender, EventArgs e)

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.5.3")] [assembly: AssemblyVersion("1.5.4")]
[assembly: AssemblyFileVersion("1.5.3")] [assembly: AssemblyFileVersion("1.5.4")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]