From 6b72db8a47538b3feb23965aa670f0374806d91c Mon Sep 17 00:00:00 2001 From: wj32 Date: Sun, 7 Dec 2008 06:34:12 +0000 Subject: [PATCH] Fixed window activation when showing Process Hacker from the tray icon git-svn-id: svn://svn.code.sf.net/p/processhacker/code@260 21ef857c-d57f-4fe0-8362-d861dc6d29cd --- trunk/CHANGELOG.txt | 3 +++ trunk/ProcessHacker/Forms/HackerWindow.cs | 1 + trunk/ProcessHacker/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/trunk/CHANGELOG.txt b/trunk/CHANGELOG.txt index 185ca5107..934cfd04b 100644 --- a/trunk/CHANGELOG.txt +++ b/trunk/CHANGELOG.txt @@ -1,5 +1,8 @@ Process Hacker +1.2.5.5 + * Fixed window activation when showing Process Hacker from the tray icon + 1.2.5.0 * Fixed wrong usernames when Process Hacker is running as a non-admin user * Gets command line of processes without using Injector diff --git a/trunk/ProcessHacker/Forms/HackerWindow.cs b/trunk/ProcessHacker/Forms/HackerWindow.cs index bc7023458..7d8af6d06 100644 --- a/trunk/ProcessHacker/Forms/HackerWindow.cs +++ b/trunk/ProcessHacker/Forms/HackerWindow.cs @@ -861,6 +861,7 @@ namespace ProcessHacker private void showHideMenuItem_Click(object sender, EventArgs e) { this.Visible = !this.Visible; + this.Activate(); } private void exitTrayMenuItem_Click(object sender, EventArgs e) diff --git a/trunk/ProcessHacker/Properties/AssemblyInfo.cs b/trunk/ProcessHacker/Properties/AssemblyInfo.cs index 204619ebe..08d957613 100644 --- a/trunk/ProcessHacker/Properties/AssemblyInfo.cs +++ b/trunk/ProcessHacker/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.2.5.0")] -[assembly: AssemblyFileVersion("1.2.5.0")] +[assembly: AssemblyVersion("1.2.5.5")] +[assembly: AssemblyFileVersion("1.2.5.5")]