Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop

2015-04-07 13:13:00 +02:00
parent ea7ecfcd56 1684976a47
commit 5a0def924a
1 changed files with 6 additions and 2 deletions
@@ -172,8 +172,12 @@ public abstract class DrawObject implements Serializable
 	{
 		Shape ownShape = getRectangle();
 		Rectangle2D otherRectangle = object.getTransform().createTransformedShape(object.getImageRectangle()).getBounds2D();
-		if (ownShape.intersects(otherRectangle))
-			return true;
+		if(ownShape != null && otherRectangle != null) {
+			if (ownShape.intersects(otherRectangle))
+				return true;
+			else
+				return false;
+		}
 		else
 			return false;
 	}