Prevent undesirable UI code access when workbench is not running

[simantics/platform.git] / bundles / org.simantics.simulation.ui / src / org / simantics / simulation / ui / ExperimentManagerListener.java

diff --git a/bundles/org.simantics.simulation.ui/src/org/simantics/simulation/ui/ExperimentManagerListener.java b/bundles/org.simantics.simulation.ui/src/org/simantics/simulation/ui/ExperimentManagerListener.java
index 402ad6fdb9734f4f29a960883a189b3f1d4ffa2e..f418b09a11069d47637c8b0f985d78fe378441cc 100644 (file)
--- a/bundles/org.simantics.simulation.ui/src/org/simantics/simulation/ui/ExperimentManagerListener.java
+++ b/bundles/org.simantics.simulation.ui/src/org/simantics/simulation/ui/ExperimentManagerListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * Copyright (c) 2007, 2019 Association for Decentralized Information Management
  * in Industry THTH ry.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
+ *     Semantum Oy - gitlab #384
  *******************************************************************************/
 package org.simantics.simulation.ui;
 
@@ -55,12 +56,11 @@ public class ExperimentManagerListener implements IExperimentManagerListener {
 
     @Override
     public void activeExperimentLoaded(final IExperiment experiment) {
-//        experiment.addListener(new ExperimentListener());
-        experiment.addListener(new org.simantics.simulation.ui.e4.ExperimentListener());
-
         if (!PlatformUI.isWorkbenchRunning())
             return;
 
+        experiment.addListener(new org.simantics.simulation.ui.e4.ExperimentListener());
+
         final IWorkbench workbench = PlatformUI.getWorkbench();
         workbench.getDisplay().asyncExec(new Runnable() {
             @Override