diff options
| author | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-01-16 14:12:07 +0300 |
|---|---|---|
| committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-01-16 14:12:07 +0300 |
| commit | abc35830a3e073e6b233ba67632b870192113291 (patch) | |
| tree | 898aaaf6f8d0cdfb5938b21707f2945d533fbe36 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring | |
| parent | 94a9f99ea493994e1999d8d85fbb014893872821 (diff) | |
Fix several merge conflicts
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs index 4cb27be1f2..1b800f55fd 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs @@ -43,7 +43,7 @@ namespace MonoDevelop.Ide.ProgressMonitoring public static void ShowResultDialog (this ProgressMonitor monitor) { if (monitor.Errors.Length == 1 && !monitor.HasWarnings) { - MessageService.ShowError (monitor.Errors [0], error.Exception); + MessageService.ShowError (monitor.Errors [0].Message, monitor.Errors [0].Exception); } else if (!monitor.HasErrors && monitor.Warnings.Length == 1) { MessageService.ShowWarning (monitor.Warnings[0]); |