From 30662036a42b3d44446f39c444a6e82b9ba4fc91 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Thu, 17 Nov 2016 18:48:44 +0100 Subject: [PATCH] Another for #198 because I suck --- Artemis/Artemis/Dialogs/MarkdownDialog.xaml.cs | 2 -- Artemis/Artemis/Services/MetroDialogService.cs | 14 ++++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Artemis/Artemis/Dialogs/MarkdownDialog.xaml.cs b/Artemis/Artemis/Dialogs/MarkdownDialog.xaml.cs index 3d6b1d7e6..3b9c69bed 100644 --- a/Artemis/Artemis/Dialogs/MarkdownDialog.xaml.cs +++ b/Artemis/Artemis/Dialogs/MarkdownDialog.xaml.cs @@ -16,8 +16,6 @@ namespace Artemis.Dialogs public static readonly DependencyProperty MarkdownProperty = DependencyProperty.Register("Markdown", typeof(string), typeof(MarkdownDialog), new PropertyMetadata(default(string))); - - public MarkdownDialog(MetroWindow parentWindow) { ParentWindow = parentWindow; diff --git a/Artemis/Artemis/Services/MetroDialogService.cs b/Artemis/Artemis/Services/MetroDialogService.cs index 2591e7a0a..ea3ad5686 100644 --- a/Artemis/Artemis/Services/MetroDialogService.cs +++ b/Artemis/Artemis/Services/MetroDialogService.cs @@ -60,13 +60,15 @@ namespace Artemis.Services if (window == null) return; - var dialog = new MarkdownDialog(window) + window.Dispatcher.Invoke(() => { - Markdown = markdown, - Title = title - }; - - window.Dispatcher.Invoke(() => window.ShowMetroDialogAsync(dialog)); + var dialog = new MarkdownDialog(window) + { + Markdown = markdown, + Title = title + }; + return window.ShowMetroDialogAsync(dialog); + }); } public override async Task ShowQuestionMessageBox(string title, string message)