Merge with main repository.

1 files changed, 5 insertions, 3 deletions

diff --git a/dw/widget.cc b/dw/widget.cc
index 04d1b81d..d3c13d4f 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -904,9 +904,11 @@ Widget *Widget::getWidgetAtPoint (int x, int y, int level)
                      (Content::WIDGET_IN_FLOW | Content::WIDGET_OOF_CONT),
                      false);
 
-      while (childAtPoint == NULL && it->next ())
-         childAtPoint = it->getContent()->widget->getWidgetAtPoint (x, y,
-                                                                    level + 1);
+      while (childAtPoint == NULL && it->next ()) {
+         Widget *child = it->getContent()->widget;
+         if (child->wasAllocated ())
+            childAtPoint = child->getWidgetAtPoint (x, y, level + 1);
+      }
 
       it->unref ();