PerspectiveSwitcher.ignoreEvent: fix NPE

jukzi · jukzi · commit ab7998d57a94 · 2024-10-09T17:27:02.000+02:00
perspSwitcherToolbar is null before createWidget() called
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.java
@@ -334,7 +334,7 @@ public void getName(AccessibleEvent e) {
 	 * @return true if the event is relevant, false if it can be ignored
 	 */
 	private boolean ignoreEvent(Object changedObj) {
-		if (perspSwitcherToolControl == null || perspSwitcherToolbar.isDisposed()) {
+		if (perspSwitcherToolControl == null || perspSwitcherToolbar == null || perspSwitcherToolbar.isDisposed()) {
 			return true;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ public void getName(AccessibleEvent e) {`
`334`	`334`	`* @return true if the event is relevant, false if it can be ignored`
`335`	`335`	`*/`
`336`	`336`	`private boolean ignoreEvent(Object changedObj) {`
`337`		`- if (perspSwitcherToolControl == null \|\| perspSwitcherToolbar.isDisposed()) {`
	`337`	`+ if (perspSwitcherToolControl == null \|\| perspSwitcherToolbar == null \|\| perspSwitcherToolbar.isDisposed()) {`
`338`	`338`	`return true;`
`339`	`339`	`}`
`340`	`340`