CheckRunningInstances improved

Author: sergiye

winUpdateMiniTool/Common/PipeIPC.cs

@@ -52,7 +52,7 @@ public MainForm() {
     }
 
     if (!OperatingSystemHelper.IsRunningAsUwp())
-      Text = $"{Updater.ApplicationTitle} v{Updater.CurrentVersion}";
+      Text = Updater.ApplicationTitle;
 
     btnWinUpd.Text = string.Format("Windows Update ({0})", 0);
     btnInstalled.Text = string.Format("Installed Updates ({0})", 0);
@@ -237,9 +237,6 @@ public MainForm() {
     mTimer.Tick += OnTimedEvent;
     mTimer.Enabled = true;
 
-    Program.Ipc.PipeMessage += PipesMessageHandler;
-    Program.Ipc.Listen();
-    
     Updater.Subscribe(
       (message, isError) => { MessageBox.Show(message, Updater.ApplicationTitle, MessageBoxButtons.OK, isError ? MessageBoxIcon.Warning : MessageBoxIcon.Information); },
       (message) => { return MessageBox.Show(message, Updater.ApplicationTitle, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK; },
@@ -291,6 +288,20 @@ private void InitializeTheme() {
 
   #endregion
 
+  protected override void WndProc(ref Message m) {
+    if (m.Msg == WinApiHelper.WM_SHOWME) {
+      notifyIcon_BalloonTipClicked(null, null);
+      Visible = true;
+      WindowState = FormWindowState.Normal;
+      Activate();
+      BringToFront();
+      WinApiHelper.SetForegroundWindow(this.Handle);
+    }
+    else {
+      base.WndProc(ref m);
+    }
+  }
+  
   private void siteToolStripMenuItem_Click(object sender, EventArgs e) {
     Updater.VisitAppSite();
   }
@@ -318,16 +329,6 @@ protected override void SetVisibleCore(bool value) {
     base.SetVisibleCore(allowShowDisplay ? value : allowShowDisplay);
   }
 
-  private void PipesMessageHandler(PipeIpc.PipeServer pipe, string data) {
-    if (data.Equals("show", StringComparison.CurrentCultureIgnoreCase)) {
-      notifyIcon_BalloonTipClicked(null, null);
-      pipe.Send("ok");
-    }
-    else {
-      pipe.Send("unknown");
-    }
-  }
-
   private void OnTimedEvent(object source, EventArgs e) {
     var updateNow = false;
     if (notifyIcon.Visible) {

winUpdateMiniTool/MainForm.cs

@@ -21,7 +21,6 @@ internal static class Program {
   private static string appPath;
   public static string WrkPath;
   private static WuAgent agent;
-  public static PipeIpc Ipc;
 
   private static string GetIniPath() {
     return Path.Combine(WrkPath, Path.ChangeExtension(Path.GetFileName(typeof(Program).Assembly.Location), ".ini"));
@@ -64,15 +63,10 @@ private static void Main(string[] mainArgs) {
       Environment.Exit(0);
     }
 
-    Ipc = new PipeIpc("wumt_pipe");
-
-    var client = Ipc.Connect(100);
-    if (client != null) {
-      AppLog.Line("Application is already running.");
-      client.Send("show");
-      var ret = client.Read(1000);
-      if (!ret.Equals("ok", StringComparison.CurrentCultureIgnoreCase))
-        MessageBox.Show("Application is already running.", Updater.ApplicationTitle, MessageBoxButtons.OK, MessageBoxIcon.Information);
+    if (WinApiHelper.CheckRunningInstances(true, true)) {
+      // fallback
+      MessageBox.Show($"{Updater.ApplicationName} is already running.", Updater.ApplicationName,
+        MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
       return;
     }