MeshCentral/MeshCentralRouter
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-10 13:23:49 +00:00
Code Issues Releases Wiki Activity

bugfix: update application stuck when "Show on system tray" is active

Browse Source
This commit is contained in:
Simon Schön
2022-06-08 18:29:12 +02:00
parent ca18e48453
commit cf67f540f3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/MainForm.cs
View File

@@ -679,7 +679,8 @@ namespace MeshCentralRouter
{ {
if (this.InvokeRequired) { this.Invoke(new MeshCentralServer.toolUpdateHandler(Meshcentral_onToolUpdate), url, hash, size, serverhash); return; } if (this.InvokeRequired) { this.Invoke(new MeshCentralServer.toolUpdateHandler(Meshcentral_onToolUpdate), url, hash, size, serverhash); return; }
UpdateForm f = new UpdateForm(url, hash, size, args, serverhash); UpdateForm f = new UpdateForm(url, hash, size, args, serverhash);
if (f.ShowDialog(this) == DialogResult.OK) { } forceExit = true;
if (f.ShowDialog(this) != DialogResult.OK) { forceExit = !notifyIcon.Visible; }
} }
private void Meshcentral_onLoginTokenChanged() private void Meshcentral_onLoginTokenChanged()

3
src/UpdateForm.cs
View File

@@ -140,7 +140,8 @@ namespace MeshCentralRouter
} else { } else {
updateMessage(Translate.T(Properties.Resources.Updating), 0); updateMessage(Translate.T(Properties.Resources.Updating), 0);
Process.Start(System.Reflection.Assembly.GetEntryAssembly().Location + ".update.exe", "-update:" + System.Reflection.Assembly.GetEntryAssembly().Location + " " + string.Join(" ", args)); Process.Start(System.Reflection.Assembly.GetEntryAssembly().Location + ".update.exe", "-update:" + System.Reflection.Assembly.GetEntryAssembly().Location + " " + string.Join(" ", args));
Application.Exit();
if (this.InvokeRequired) { this.Invoke((MethodInvoker)delegate { Application.Exit(); }); } else { Application.Exit(); }
} }
} }
} }