X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fproperty%2FBooleanPropertyManipulator.java;h=7d9b65b6e48dc1d578d66c78d34fea65ab534183;hb=2a4aa4460d5df9da6b348adb2f5ba8c46b071520;hp=88a7444021c7bbb2bd4e612f186855462d2d1ecc;hpb=87b3241ec277ba3d8e414b26186a032c9cdcaeed;p=simantics%2F3d.git

diff --git a/org.simantics.g3d/src/org/simantics/g3d/property/BooleanPropertyManipulator.java b/org.simantics.g3d/src/org/simantics/g3d/property/BooleanPropertyManipulator.java
index 88a74440..7d9b65b6 100644
--- a/org.simantics.g3d/src/org/simantics/g3d/property/BooleanPropertyManipulator.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/property/BooleanPropertyManipulator.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 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
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
 package org.simantics.g3d.property;
 
 
@@ -31,7 +42,9 @@ public class BooleanPropertyManipulator implements PropertyManipulator {
 		if (editMode)
 			return editValue;
 		try {
-			return provider.getValue(input).toString();
+			Object value = provider.getValue(input);
+			if (value == null) return null;
+			return value.toString();
 		} catch (Exception e) {
 			return null;
 		}