Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay

fideoman · Oct 22, 2019 · cc15bc0 · cc15bc0
2 parents c6a5adf + b38f37b
commit cc15bc0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs
@@ -397,12 +397,6 @@ public DS4Form(string[] args)
                 }
             }
 
-            Form_Resize(null, null);
-            if (!(StartMinimized || mini))
-            {
-                Show();
-            }
-
             this.Resize += Form_Resize;
             this.LocationChanged += TrackLocationChanged;
 
@@ -465,6 +459,9 @@ public DS4Form(string[] args)
             timerThread.IsBackground = true;
             timerThread.Priority = ThreadPriority.Lowest;
             timerThread.Start();
+
+            // Have Form_Resize run to honor minimize setting
+            Show();
         }
 
         private void TBUdpListenAddress_Leave(object sender, EventArgs e)

diff --git a/DS4Windows/Properties/AssemblyInfo.cs b/DS4Windows/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.18")]
-[assembly: AssemblyFileVersion("1.7.18")]
+[assembly: AssemblyVersion("1.7.19")]
+[assembly: AssemblyFileVersion("1.7.19")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/DS4Windows/newest.txt b/DS4Windows/newest.txt
@@ -1 +1 @@
-1.7.18
+1.7.19