From 46e529f7bed50966071fe3e1666fc57398409beb Mon Sep 17 00:00:00 2001 From: jays2kings Date: Wed, 9 Jul 2014 13:18:11 -0400 Subject: [PATCH] Fix for select an action window popping up when connecting a controller in some circumstances DS4Updater: quicker startup, will only replace updater if the version is actually newer, smaller size --- DS4Tool/Program.cs | 6 +++--- DS4Tool/Properties/AssemblyInfo.cs | 4 ++-- DS4Tool/ScpForm.cs | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/DS4Tool/Program.cs b/DS4Tool/Program.cs index 0e5f85a..0c015c4 100644 --- a/DS4Tool/Program.cs +++ b/DS4Tool/Program.cs @@ -43,12 +43,12 @@ namespace ScpServer else { Process current = Process.GetCurrentProcess(); - foreach (Process process in Process.GetProcessesByName(current.ProcessName)) + foreach (Process process in Process.GetProcessesByName("DS4Windows")) { if (process.Id != current.Id) { - SetForegroundWindow(process.MainWindowHandle); - if (GetForegroundWindow() != process.MainWindowHandle) + SetForegroundWindow(process.MainWindowHandle); + if (GetForegroundWindow() != process.MainWindowHandle) //if tool is minimized to tray { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); diff --git a/DS4Tool/Properties/AssemblyInfo.cs b/DS4Tool/Properties/AssemblyInfo.cs index 361b8ce..457071d 100644 --- a/DS4Tool/Properties/AssemblyInfo.cs +++ b/DS4Tool/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.4.0.1")] -[assembly: AssemblyFileVersion("1.4.0.1")] +[assembly: AssemblyVersion("1.4.0.11")] +[assembly: AssemblyFileVersion("1.4.0.11")] diff --git a/DS4Tool/ScpForm.cs b/DS4Tool/ScpForm.cs index de77e9f..861a1bb 100644 --- a/DS4Tool/ScpForm.cs +++ b/DS4Tool/ScpForm.cs @@ -627,8 +627,12 @@ namespace ScpServer if (Pads[Index].Text != "Connecting...") { Enable_Controls(Index, true); + if (opt != null) + opt.inputtimer.Start(); //MinimumSize = new Size(MinimumSize.Width, 137 + 29 * Index); } + else if (opt != null) + opt.inputtimer.Stop(); } else {