Author: mhutch
Date: 2006-07-26 05:44:21 -0400 (Wed, 26 Jul 2006)
New Revision: 62987
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
Log:
2006-07-25 Matej Urbas <[EMAIL PROTECTED]>
* MonoDevelop.DesignerSupport/ToolboxService.cs: Prevent null
exception when all documents are closed.
Modified: trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
2006-07-26 07:29:12 UTC (rev 62986)
+++ trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
2006-07-26 09:44:21 UTC (rev 62987)
@@ -1,3 +1,8 @@
+2006-07-25 Matej Urbas <[EMAIL PROTECTED]>
+
+ * MonoDevelop.DesignerSupport/ToolboxService.cs: Prevent null
+ exception when all documents are closed.
+
2006-07-25 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.DesignerSupport.mdp:
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
2006-07-26 07:29:12 UTC (rev 62986)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
2006-07-26 09:44:21 UTC (rev 62987)
@@ -168,7 +168,8 @@
{
if (oldActiveDoc != null)
oldActiveDoc.ViewChanged -= OnViewChanged;
- IdeApp.Workbench.ActiveDocument.ViewChanged +=
OnViewChanged;
+ if (IdeApp.Workbench.ActiveDocument != null)
+ IdeApp.Workbench.ActiveDocument.ViewChanged +=
OnViewChanged;
oldActiveDoc = IdeApp.Workbench.ActiveDocument;
OnViewChanged (null, null);
@@ -177,7 +178,11 @@
void OnViewChanged (object sender, EventArgs args)
{
//only treat active ViewContent as a Toolbox consumer
if it implements IToolboxConsumer
- currentConsumer =
IdeApp.Workbench.ActiveDocument.ActiveView as IToolboxConsumer;
+ if (IdeApp.Workbench.ActiveDocument != null)
+ currentConsumer =
IdeApp.Workbench.ActiveDocument.ActiveView as IToolboxConsumer;
+ else
+ currentConsumer = null;
+
OnToolboxConsumerChanged (currentConsumer);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches