From a815374695f10216791871fd33e680e1a25591bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= <jkubitz-eclipse@gmx.de>
Date: Wed, 9 Oct 2024 16:18:42 +0200
Subject: [PATCH] PerspectiveSwitcher.ignoreEvent: fix NPE

perspSwitcherToolbar is null before createWidget() called
---
 .../addons/perspectiveswitcher/PerspectiveSwitcher.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 786bcadb323..077c0d1f1de 100644
--- 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;
 		}