mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Fix for 60772: NPE cancelling Selection Search in Working Set
This commit is contained in:
parent
66026fcc9e
commit
2dfa4fa8a1
2 changed files with 13 additions and 5 deletions
|
@ -1,8 +1,8 @@
|
|||
2004-06-07 Alain Magloire
|
||||
|
||||
Fix PR 64328
|
||||
* src/org/eclipse/cdt/internal/ui/poreferences/PreferencesMessages.properties
|
||||
|
||||
2004-06-07 Bogdan Gheorghe
|
||||
Fix for Bug 60772
|
||||
|
||||
* src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java
|
||||
|
||||
2004-06-06 Bogdan Gheorghe
|
||||
Changed MouseClickListener to use Parser KeywordSets
|
||||
* src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java
|
||||
|
|
|
@ -54,6 +54,10 @@ public abstract class FindAction extends SelectionParseAction {
|
|||
protected CSearchQuery createSearchQuery(String pattern, SearchFor searchFor) {
|
||||
CSearchQuery op = null;
|
||||
ICSearchScope scope = getScope();
|
||||
|
||||
if (scope == null)
|
||||
return null;
|
||||
|
||||
String scopeDescription = getScopeDescription();
|
||||
|
||||
//Create a case sensitive search operation - limited by the node
|
||||
|
@ -159,6 +163,10 @@ public abstract class FindAction extends SelectionParseAction {
|
|||
}
|
||||
|
||||
CSearchQuery job = createSearchQuery(node);
|
||||
|
||||
if (job == null)
|
||||
return;
|
||||
|
||||
NewSearchUI.activateSearchResultView();
|
||||
|
||||
NewSearchUI.runQuery(job);
|
||||
|
|
Loading…
Add table
Reference in a new issue