X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fprofile%2FVertexSizeStyle.java;h=b59590b6e301a5e122f6c3c9175eb04a125f49e9;hb=26ace6ab51bc85e8c7429b84a0402e70b49fc062;hp=d536bc0438b6b78b42a84c390a14cc24df13c002;hpb=8958c9b265fc6a842c76714b60f0d99740434243;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/VertexSizeStyle.java b/org.simantics.district.network/src/org/simantics/district/network/profile/VertexSizeStyle.java
index d536bc04..b59590b6 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/VertexSizeStyle.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/VertexSizeStyle.java
@@ -20,17 +20,24 @@ public class VertexSizeStyle extends ThrottledStyleBase<Double> {
 	public Double calculateThrottledStyle(ReadGraph graph, Resource runtimeDiagram, Resource entry, Resource groupItem) throws DatabaseException {
 		DiagramSettings ds = graph.syncRequest(new DiagramSettingsRequest(runtimeDiagram), TransientCacheAsyncListener.instance());
 		Double scaling = ONE;
-		if (ds.vertexScaleProperty.isPresent()) {
-			scaling = Simantics.applySCLRead(graph, ds.vertexScaleProperty.get(), groupItem);
-			if (scaling == null) {
-				scaling = ONE;
-			} else {
-//				System.out.println("read vertex scaling: " + scaling + " : " + ds.vertexScaleProperty);
-				scaling = scaling * ds.vertexScaleGain + ds.vertexScaleBias;
-//				System.out.println("RESULT: " + scaling);
+		// Prevent PendingVariableExceptions from coming through
+		boolean wasSynchronous = graph.setSynchronous(true);
+		try {
+			if (ds.vertexScaleProperty.isPresent()) {
+				scaling = Simantics.applySCLRead(graph, ds.vertexScaleProperty.get(), groupItem);
+				if (scaling == null) {
+					scaling = ONE;
+				} else {
+	//				System.out.println("read vertex scaling: " + scaling + " : " + ds.vertexScaleProperty);
+					scaling = scaling * ds.vertexScaleGain + ds.vertexScaleBias;
+	//				System.out.println("RESULT: " + scaling);
+				}
 			}
+			return scaling;
+		}
+		finally {
+			graph.setSynchronous(wasSynchronous);
 		}
-		return scaling;
 	}
 
 	@Override