Browse Source

Fix forum-12634: ArgumentNullException on Right click on Project Upgrade tab and call "Navigate to file"

4.0
Daniel Grunwald 15 years ago
parent
commit
78c9644b88
  1. 7
      src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs
  2. 3
      src/Main/Base/Project/Src/Project/Solution/Solution.cs

7
src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs

@ -81,8 +81,11 @@ namespace ICSharpCode.SharpDevelop.Commands.TabStrip
public override void Run() public override void Run()
{ {
var projectBrowser = (ProjectBrowserPad.Instance.Control as ProjectBrowserPanel).ProjectBrowserControl; var projectBrowser = (ProjectBrowserPad.Instance.Control as ProjectBrowserPanel).ProjectBrowserControl;
projectBrowser.SelectFileAndExpand(((IWorkbenchWindow)Owner).ActiveViewContent.PrimaryFileName); var fileName = ((IWorkbenchWindow)Owner).ActiveViewContent.PrimaryFileName;
projectBrowser.Focus(); if (fileName != null) {
projectBrowser.SelectFileAndExpand(fileName);
projectBrowser.Focus();
}
} }
} }

3
src/Main/Base/Project/Src/Project/Solution/Solution.cs

@ -37,6 +37,9 @@ namespace ICSharpCode.SharpDevelop.Project
#region Enumerate projects/folders #region Enumerate projects/folders
public IProject FindProjectContainingFile(string fileName) public IProject FindProjectContainingFile(string fileName)
{ {
if (fileName == null)
throw new ArgumentNullException("fileName");
IProject currentProject = ProjectService.CurrentProject; IProject currentProject = ProjectService.CurrentProject;
if (currentProject != null && currentProject.IsFileInProject(fileName)) if (currentProject != null && currentProject.IsFileInProject(fileName))
return currentProject; return currentProject;

Loading…
Cancel
Save