Update bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java

jjohnstn · ptziegler · fedejeanne · commit 05e977fc3633 · 2025-07-14T09:28:31.000+02:00
Co-authored-by: Patrick Ziegler &lt;ziegler.patrick@hotmail.de&gt;
diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
@@ -856,6 +856,8 @@ public void addScopeChangedListener(IScopeChangedListener listener) {
 
 	@Override
 	public void removeScopeChangedListener(IScopeChangedListener listener) {
-		fScopeChangeListeners.remove(listener);
+		if (fScopeChangeListeners != null) {
+			fScopeChangeListeners.remove(listener);
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -856,6 +856,8 @@ public void addScopeChangedListener(IScopeChangedListener listener) {`
`856`	`856`
`857`	`857`	`@Override`
`858`	`858`	`public void removeScopeChangedListener(IScopeChangedListener listener) {`
`859`		`- fScopeChangeListeners.remove(listener);`
	`859`	`+ if (fScopeChangeListeners != null) {`
	`860`	`+ fScopeChangeListeners.remove(listener);`
	`861`	`+ }`
`860`	`862`	`}`
`861`	`863`	`}`