diff options
| author | Mike Krüger <mkrueger@novell.com> | 2009-09-22 10:42:04 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2009-09-22 10:42:04 +0400 |
| commit | 10836911f053a6710e3c64536e8a0ad9f4692530 (patch) | |
| tree | 0dccbf3286f0b524eb086935eee8a0bfee4b847f /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles | |
| parent | addea0580324640352da7bd08e3cc17110020cde (diff) | |
* MonoDevelop.Ide.FindInFiles/Scope.cs:
* MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs: Fixed 'Bug 540891
- NRE when launching Find In Files search (whole solution)'.
svn path=/trunk/monodevelop/; revision=142368
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs | 8 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs index 962716fd6c..14ca6c282f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs @@ -122,8 +122,9 @@ namespace MonoDevelop.Ide.FindInFiles scopeStore.AppendValues (GettextCatalog.GetString ("Directories")); scopeStore.AppendValues (GettextCatalog.GetString ("Current document")); scopeStore.AppendValues (GettextCatalog.GetString ("Selection")); + comboboxScope.Model = scopeStore; - + comboboxScope.Changed += HandleScopeChanged; InitFromProperties (); @@ -427,7 +428,10 @@ namespace MonoDevelop.Ide.FindInFiles case ScopeWholeSolution: return new WholeSolutionScope (); case ScopeCurrentProject: - return new WholeProjectScope (IdeApp.ProjectOperations.CurrentSelectedProject); + MonoDevelop.Projects.Project currentSelectedProject = IdeApp.ProjectOperations.CurrentSelectedProject; + if (currentSelectedProject != null) + return new WholeProjectScope (currentSelectedProject); + return new WholeSolutionScope (); case ScopeAllOpenFiles: return new AllOpenFilesScope (); case ScopeDirectories: diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs index ffd09dbec7..2b54a162c1 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs @@ -135,6 +135,9 @@ namespace MonoDevelop.Ide.FindInFiles public WholeProjectScope (Project project) { + if (project == null) + throw new ArgumentNullException ("project"); + this.project = project; } |