diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-27 22:10:25 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-27 22:11:11 +0400 |
| commit | 0c8176c6a0b9e4b24422c9a3c278beac8ee74b3a (patch) | |
| tree | d50ef56998661985cd17ef0edc836f8e6c58eeef /main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | |
| parent | 97e0977a13a8210eda3b95adc851cfd18f474709 (diff) | |
Fixed "Bug 1729 - Error in merge widget when quitting MD".
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs index 9ab8a99e25..4cb9dc10c1 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs @@ -43,7 +43,7 @@ namespace MonoDevelop.VersionControl.Views { protected override TextEditor MainEditor { get { - return editors[1]; + return editors != null && editors.Length >= 2 ? editors[1] : null; } } @@ -95,7 +95,8 @@ namespace MonoDevelop.VersionControl.Views protected override void OnDestroyed () { base.OnDestroyed (); - MainEditor.Document.TextReplaced -= UpdateConflictsOnTextReplace; + if (MainEditor != null && MainEditor.Document != null) + MainEditor.Document.TextReplaced -= UpdateConflictsOnTextReplace; } public string GetResultText () |