From 90e3b939a367dbb760d8ae1c33dacea3599d99a0 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sun, 6 Feb 2011 22:01:58 +0000 Subject: [PATCH] Fix null reference exception when dragging controls from the toolbox to a WiX dialog when a project has not been opened. --- .../FormsDesigner/Project/Src/ToolboxProvider.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs index aff68b55ea..84db6cd3e7 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs @@ -218,6 +218,10 @@ namespace ICSharpCode.FormsDesigner static IProject FindProjectContainingType(string type) { IProject currentProject = ProjectService.CurrentProject; + if (currentProject == null) { + return null; + } + foreach (IProject project in ProjectService.OpenSolution.Projects) { if (project != currentProject) { IProjectContent projectContent = ParserService.GetProjectContent(project);