From f552da43ca12609882a565129f7cd87fe10a4af9 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 3 Apr 2007 17:14:40 +0000 Subject: [PATCH] Prevent PropertyContainer from failing when there is no workbench (in unit tests) git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2466 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs | 6 ++++-- src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs b/src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs index 65f7821887..ff455cb872 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs @@ -40,8 +40,10 @@ namespace ICSharpCode.SharpDevelop.Gui /// public PropertyContainer() { - PadDescriptor desc = WorkbenchSingleton.Workbench.GetPad(typeof(PropertyPad)); - if (desc != null) desc.CreatePad(); + if (WorkbenchSingleton.Workbench != null) { + PadDescriptor desc = WorkbenchSingleton.Workbench.GetPad(typeof(PropertyPad)); + if (desc != null) desc.CreatePad(); + } } object selectedObject; diff --git a/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs b/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs index 5946de4e13..63511676d0 100644 --- a/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs +++ b/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs @@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.Gui const string workbenchMemento = "WorkbenchMemento"; static STAThreadCaller caller; - static DefaultWorkbench workbench = null; + static DefaultWorkbench workbench; public static Form MainForm { get { @@ -27,6 +27,9 @@ namespace ICSharpCode.SharpDevelop.Gui } } + /// + /// Gets the workbench. Returns null in unit-testing mode. + /// public static IWorkbench Workbench { get { return workbench;