Skip to content

Commit 5ce6eb6

Browse files
committed
Updater messages invocation fix
1 parent 5f5524a commit 5ce6eb6

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

OpenHardwareMonitor/UI/MainForm.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,11 +429,14 @@ public MainForm()
429429

430430
Updater.Subscribe(
431431
(message, isError) => {
432-
MessageBox.Show(message, Updater.ApplicationName, MessageBoxButtons.OK, isError ? MessageBoxIcon.Warning : MessageBoxIcon.Information);
433-
},
434-
(message) => {
435-
return MessageBox.Show(message, Updater.ApplicationName, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK;
432+
if (InvokeRequired)
433+
Invoke(new Action(() => MessageBox.Show(message, Updater.ApplicationName, MessageBoxButtons.OK, isError ? MessageBoxIcon.Warning : MessageBoxIcon.Information)));
434+
else
435+
MessageBox.Show(message, Updater.ApplicationName, MessageBoxButtons.OK, isError ? MessageBoxIcon.Warning : MessageBoxIcon.Information);
436436
},
437+
message => InvokeRequired
438+
? (bool)Invoke(new Func<bool>(() => MessageBox.Show(this, message, Updater.ApplicationName, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK))
439+
: MessageBox.Show(this, message, Updater.ApplicationName, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK,
437440
() => CloseApplication(null, EventArgs.Empty)
438441
);
439442
FormClosed += CloseApplication;

0 commit comments

Comments
 (0)