bug[ats_ZVS5C]: Null pointer exception caused by Handlers

1 files changed, 10 insertions, 6 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AbstractSelectionChangedHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AbstractSelectionChangedHandler.java
index 27f587ff370..4716b5a9eed 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AbstractSelectionChangedHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AbstractSelectionChangedHandler.java
@@ -16,6 +16,7 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.swt.events.MenuDetectEvent;
 import org.eclipse.swt.events.MenuDetectListener;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
@@ -38,13 +39,16 @@ public abstract class AbstractSelectionChangedHandler extends AbstractHandler {
    }
 
    private void addlistener() {
-      if (!PlatformUI.getWorkbench().isClosing()) {
-         viewerMenuDetectListener = new ViewerMenuDetectListener();
-         IWorkbenchPart workbenchPart = AWorkbench.getActivePage().getActivePart();
-         Object object = workbenchPart.getSite().getSelectionProvider();
+      if (PlatformUI.isWorkbenchRunning()) {
+         IWorkbench workbench = PlatformUI.getWorkbench();
+         if (workbench != null && !workbench.isStarting() && !workbench.isClosing()) {
+            viewerMenuDetectListener = new ViewerMenuDetectListener();
+            IWorkbenchPart workbenchPart = AWorkbench.getActivePage().getActivePart();
+            Object object = workbenchPart.getSite().getSelectionProvider();
 
-         if (object instanceof Viewer) {
-            ((Viewer) object).getControl().addMenuDetectListener(viewerMenuDetectListener);
+            if (object instanceof Viewer) {
+               ((Viewer) object).getControl().addMenuDetectListener(viewerMenuDetectListener);
+            }
          }
       }
    }