empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fixed crash when checking for updates

Browse source
This commit is contained in:
Sour 2017-12-27 13:20:20 -05:00
parent 7f52579183
commit 0c1bb49402
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
GUI.NET/Forms/MesenMsgBox.cs
View file

@ -20,7 +20,16 @@ namespace Mesen.GUI.Forms
return MessageBox.Show(string.Format("Critical error (" + text + ")"), "Mesen", buttons, icon);
}
} else {
return MessageBox.Show(Application.OpenForms[0], ResourceHelper.GetMessage(text, args), "Mesen", buttons, icon);
Form mainForm = Application.OpenForms.Count > 0 ? Application.OpenForms[0] : null;
if(mainForm?.InvokeRequired == true) {
DialogResult result = DialogResult.Cancel;
mainForm.Invoke((Action)(() => {
result = MessageBox.Show(mainForm, ResourceHelper.GetMessage(text, args), "Mesen", buttons, icon);
}));
return result;
} else {
return MessageBox.Show(mainForm, ResourceHelper.GetMessage(text, args), "Mesen", buttons, icon);
}
}
}
}