mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2024-12-26 16:41:50 +01:00
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
This commit is contained in:
commit
cc15bc0551
@ -397,12 +397,6 @@ namespace DS4Windows.Forms
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Form_Resize(null, null);
|
|
||||||
if (!(StartMinimized || mini))
|
|
||||||
{
|
|
||||||
Show();
|
|
||||||
}
|
|
||||||
|
|
||||||
this.Resize += Form_Resize;
|
this.Resize += Form_Resize;
|
||||||
this.LocationChanged += TrackLocationChanged;
|
this.LocationChanged += TrackLocationChanged;
|
||||||
|
|
||||||
@ -465,6 +459,9 @@ namespace DS4Windows.Forms
|
|||||||
timerThread.IsBackground = true;
|
timerThread.IsBackground = true;
|
||||||
timerThread.Priority = ThreadPriority.Lowest;
|
timerThread.Priority = ThreadPriority.Lowest;
|
||||||
timerThread.Start();
|
timerThread.Start();
|
||||||
|
|
||||||
|
// Have Form_Resize run to honor minimize setting
|
||||||
|
Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TBUdpListenAddress_Leave(object sender, EventArgs e)
|
private void TBUdpListenAddress_Leave(object sender, EventArgs e)
|
||||||
|
@ -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.18")]
|
[assembly: AssemblyVersion("1.7.19")]
|
||||||
[assembly: AssemblyFileVersion("1.7.18")]
|
[assembly: AssemblyFileVersion("1.7.19")]
|
||||||
[assembly: NeutralResourcesLanguage("en")]
|
[assembly: NeutralResourcesLanguage("en")]
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
1.7.18
|
1.7.19
|
||||||
|
Loading…
Reference in New Issue
Block a user