diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-08 21:57:22 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-08 21:57:22 +0400 |
| commit | 3d7a7f93a50819a5089e21bfedd332dc08d4f0ce (patch) | |
| tree | 0956c7d9cd3c6d2cc7344398ea6fb182952a55be /main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | |
| parent | e51679b1a150ba564ade1510f94e9c05c4e6fa65 (diff) | |
| parent | ec035e02db5d9b6e9a2c2275d3145b44264dc546 (diff) | |
Merge remote-tracking branch 'origin/master' into macgtk
Conflicts:
extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/GtkWorkarounds.cs
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 f9a87a1525..25b03dbbb5 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 @@ -44,7 +44,7 @@ namespace MonoDevelop.VersionControl.Views { protected override TextEditor MainEditor { get { - return editors[1]; + return editors != null && editors.Length >= 2 ? editors[1] : null; } } @@ -96,7 +96,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 () |