diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2014-11-21 20:23:29 +0300 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2014-11-21 20:23:29 +0300 |
| commit | be7e828bf32119e0458d36bbf9c43c9fde0a8625 (patch) | |
| tree | 8b9bb3cbd33407d041b8754713474629adb08894 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring | |
| parent | 6236431569dd0add268751d442572cf8f39c1973 (diff) | |
| parent | 47859db9be8d351b4cd98b3ba5d97e20d87a048f (diff) | |
Merge branch 'master' into xs6-editor
Conflicts:
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisBatchRunner.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring')
2 files changed, 4 insertions, 8 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 a7359939a2..8d9b8a1380 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs @@ -169,8 +169,7 @@ namespace MonoDevelop.Ide.ProgressMonitoring OnCompleted (); } catch (Exception ex) { string msg = "Unhandled exception in monitor cancel event handler"; - LoggingService.LogError (msg, ex); - MessageService.ShowException (ex, msg); + LoggingService.LogInternalError (msg, ex); } } @@ -334,10 +333,7 @@ namespace MonoDevelop.Ide.ProgressMonitoring protected void ShowResultDialog () { if (Errors.Count == 1 && Warnings.Count == 0) { - if (ErrorException != null) - MessageService.ShowException (ErrorException, Errors[0]); - else - MessageService.ShowError (Errors[0]); + MessageService.ShowError (Errors[0], ErrorException); } else if (Errors.Count == 0 && Warnings.Count == 1) { MessageService.ShowWarning (Warnings[0]); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs index 798773b38f..24f3de9559 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs @@ -186,14 +186,14 @@ namespace MonoDevelop.Ide.ProgressMonitoring string s = ""; foreach (string m in errorsMessages) s += m + "\n"; - MessageService.ShowException (errorException, s); + MessageService.ShowError (s, errorException); } if (warningMessages.Count > 0) { string s = ""; foreach (string m in warningMessages) s += m + "\n"; - MessageService.ShowError (s); + MessageService.ShowWarning (s); } } } |