diff --git a/VECTO3GUI2020/Helper/DialogHelper.cs b/VECTO3GUI2020/Helper/DialogHelper.cs index 39162d69b8228623221234bbfc41eefa38232d31..5537e0fd0808771ce49b200fd3aa0e6e48b8a800 100644 --- a/VECTO3GUI2020/Helper/DialogHelper.cs +++ b/VECTO3GUI2020/Helper/DialogHelper.cs @@ -2,7 +2,9 @@ using System.IO; using System.Windows; using System.Windows.Forms; +using System.Windows.Threading; using VECTO3GUI2020.Properties; +using Application = System.Windows.Application; using MessageBox = System.Windows.MessageBox; namespace VECTO3GUI2020.Helper @@ -143,13 +145,23 @@ namespace VECTO3GUI2020.Helper MessageBoxButton button, MessageBoxImage icon) { - return MessageBox.Show(messageBoxText, caption, button, icon); + var t = Application.Current.Dispatcher + .InvokeAsync(() => MessageBox.Show(messageBoxText, caption, button, icon)).Task; + + t.Wait(); + return t.Result; + //return MessageBox.Show(messageBoxText, caption, button, icon); } public MessageBoxResult ShowMessageBox(string messageBoxText, string caption) { - return MessageBox.Show(messageBoxText, caption); - } + var t = Application.Current.Dispatcher + .InvokeAsync(() => MessageBox.Show(messageBoxText, caption)).Task; + + t.Wait(); + return t.Result; + //return MessageBox.Show(messageBoxText, caption); + } diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs index fdd52be745a696b4915d60d576e1aad8fc4d5122..1167ff77e0b7bf546cb67838e5b7d15472f51881 100644 --- a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs +++ b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs @@ -585,6 +585,10 @@ namespace VECTO3GUI2020.ViewModel.Implementation Type = MessageType.ErrorMessage, Message = ex.Message }); + DialogHelper.ShowErrorMessage( + $"ERROR running job {Path.GetFileName(jobEntry.DataSource.SourceFile)}: {ex.Message}", "Error"); + status.Report($"Failed to initialize Simulation"); + return; } } foreach (var cycle in jobContainer.GetCycleTypes())