diff options
| -rw-r--r-- | client/src/com/vaadin/client/ui/accordion/VAccordion.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/ui/accordion/VAccordion.java b/client/src/com/vaadin/client/ui/accordion/VAccordion.java index ce973f9630..70398c238f 100644 --- a/client/src/com/vaadin/client/ui/accordion/VAccordion.java +++ b/client/src/com/vaadin/client/ui/accordion/VAccordion.java @@ -131,7 +131,7 @@ public class VAccordion extends VTabsheetBase { Widget itemWidget = item.getComponent(); if (tabContent != null) { - if (tabContent != itemWidget) { + if (tabContent.getWidget() != itemWidget) { /* * This is not the same widget as before, find out if it has * been moved @@ -542,8 +542,14 @@ public class VAccordion extends VTabsheetBase { @Override protected ComponentConnector getTab(int index) { if (index < getWidgetCount()) { - Widget w = getStackItem(index); - return ConnectorMap.get(client).getConnector(w); + StackItem stackItem = getStackItem(index); + if (stackItem == null) { + return null; + } + Widget w = stackItem.getChildWidget(); + if (w != null) { + return ConnectorMap.get(client).getConnector(w); + } } return null; |