Ensure layout -> caption dependencies are unregistered when a slot

is removed

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
index ce317ee563362cc7da5394ba52002325bcc54192..cb353825b625b7576920d3da106eb35ab2a61c42 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
@@ -77,7 +77,9 @@ public class VMeasuringOrderedLayout extends ComplexPanel {
     public void removeSlot(VLayoutSlot slot) {
         VCaption caption = slot.getCaption();
         if (caption != null) {
-            remove(caption);
+            // Must remove using setCaption to ensure dependencies (layout ->
+            // caption) are unregistered
+            slot.setCaption(null);
         }
 
         remove(slot.getWidget());