From 78c9644b88d7de07e93216bcff938f6b2ca99278 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 1 Feb 2011 19:36:05 +0100 Subject: [PATCH] Fix forum-12634: ArgumentNullException on Right click on Project Upgrade tab and call "Navigate to file" --- src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs | 7 +++++-- src/Main/Base/Project/Src/Project/Solution/Solution.cs | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs b/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs index 504aa8cadc..e84d917c3c 100644 --- a/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs +++ b/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs @@ -81,8 +81,11 @@ namespace ICSharpCode.SharpDevelop.Commands.TabStrip public override void Run() { var projectBrowser = (ProjectBrowserPad.Instance.Control as ProjectBrowserPanel).ProjectBrowserControl; - projectBrowser.SelectFileAndExpand(((IWorkbenchWindow)Owner).ActiveViewContent.PrimaryFileName); - projectBrowser.Focus(); + var fileName = ((IWorkbenchWindow)Owner).ActiveViewContent.PrimaryFileName; + if (fileName != null) { + projectBrowser.SelectFileAndExpand(fileName); + projectBrowser.Focus(); + } } } diff --git a/src/Main/Base/Project/Src/Project/Solution/Solution.cs b/src/Main/Base/Project/Src/Project/Solution/Solution.cs index caca958b4b..3659d0d760 100644 --- a/src/Main/Base/Project/Src/Project/Solution/Solution.cs +++ b/src/Main/Base/Project/Src/Project/Solution/Solution.cs @@ -37,6 +37,9 @@ namespace ICSharpCode.SharpDevelop.Project #region Enumerate projects/folders public IProject FindProjectContainingFile(string fileName) { + if (fileName == null) + throw new ArgumentNullException("fileName"); + IProject currentProject = ProjectService.CurrentProject; if (currentProject != null && currentProject.IsFileInProject(fileName)) return currentProject;