X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scenegraph.profile%2Fsrc%2Forg%2Fsimantics%2Fscenegraph%2Fprofile%2Frequest%2FRuntimeProfileActiveEntryResources.java;h=f59c1d71a0978addc151df7c0705e23543ffbeb2;hp=5c438533d8c84f818bb14172c478a12e64a60b6f;hb=11532e91770beadd55d85037c4b5e00bbcace69f;hpb=d0f755ad31c06641f8e9a9010a79356f483340c5

diff --git a/bundles/org.simantics.scenegraph.profile/src/org/simantics/scenegraph/profile/request/RuntimeProfileActiveEntryResources.java b/bundles/org.simantics.scenegraph.profile/src/org/simantics/scenegraph/profile/request/RuntimeProfileActiveEntryResources.java
index 5c438533d..f59c1d71a 100644
--- a/bundles/org.simantics.scenegraph.profile/src/org/simantics/scenegraph/profile/request/RuntimeProfileActiveEntryResources.java
+++ b/bundles/org.simantics.scenegraph.profile/src/org/simantics/scenegraph/profile/request/RuntimeProfileActiveEntryResources.java
@@ -21,6 +21,7 @@ import org.simantics.db.common.NamedResource;
 import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.scenegraph.profile.ProfileUtils;
 
 /**
  * @author Antti Villberg
@@ -53,7 +54,14 @@ public class RuntimeProfileActiveEntryResources extends ResourceRead<Collection<
         if (rootEntries == null)
             return result;
         
-        result.addAll(graph.syncRequest(new ProfileActiveEntryResources(activeProfile, rootEntries)));
+        if(graph.isImmutable(activeProfile)) {
+        	Resource activationState = ProfileUtils.getPossibleProfileActivationState(graph, resource, activeProfile);
+        	if(activationState != null) {
+	        	result.addAll(graph.syncRequest(new ProfileActiveEntryResources(activationState, rootEntries)));
+        	}
+        } else {
+        	result.addAll(graph.syncRequest(new ProfileActiveEntryResources(activeProfile, rootEntries)));
+        }
         
         return result;