Don't allow setting the same layout multiple times (caused bug)

svn changeset:4011/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/Panel.java b/src/com/itmill/toolkit/ui/Panel.java
index db1f58646f9a08aa769982de03649c4008264a10..20840404273d3b9eb3a1d315f9af0e49c5abfa8d 100644 (file)
--- a/src/com/itmill/toolkit/ui/Panel.java
+++ b/src/com/itmill/toolkit/ui/Panel.java
@@ -122,6 +122,11 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
             layout.setMargin(true);
         }
 
+        if (layout == this.layout) {
+            // don't set the same layout twice
+            return;
+        }
+
         // Sets the panel to be parent for the layout
         layout.setParent(this);