Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ward <matt.ward@xamarin.com>2016-02-19 17:18:35 +0300
committerMatt Ward <matt.ward@xamarin.com>2016-02-19 17:18:35 +0300
commite0f31d508f58efd37710b314e90ac590c18a024a (patch)
tree9a23e004225603b60a54becb540e1063837ab1ed /main/src/addins/MonoDevelop.GtkCore
parent5f8186512a8c628d293004968bafc65e9a8a535d (diff)
[GtkCore] Fix null reference when closing the GTK# designer.
Diffstat (limited to 'main/src/addins/MonoDevelop.GtkCore')
-rw-r--r--main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
index 380c953a6b..eb93b3efe0 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
@@ -124,7 +124,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
protected override void OnWorkbenchWindowChanged ()
{
base.OnWorkbenchWindowChanged ();
- content.WorkbenchWindow = WorkbenchWindow;
+ if (content != null)
+ content.WorkbenchWindow = WorkbenchWindow;
if (WorkbenchWindow != null) {
foreach (TabView view in tabs) {
view.WorkbenchWindow = WorkbenchWindow;
@@ -166,6 +167,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
public override void Dispose ()
{
+ if (content == null)
+ return;
+
content.DirtyChanged -= new EventHandler (OnTextDirtyChanged);
IdeApp.Workbench.ActiveDocumentChanged -= new EventHandler (OnActiveDocumentChanged);
content.Dispose ();