Fix setLayout method that was causing segfault when itemAt wasn't implemented.

Reviewer: Hugo Parente <hugo.lima@openbossa.org>
          Renato Araújo <renato.filho@openbossa.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/PySide/QtGui/glue/qlayout_help_functions.h b/PySide/QtGui/glue/qlayout_help_functions.h
index 0a6dd0eb0..452dbc181 100644
--- a/PySide/QtGui/glue/qlayout_help_functions.h
+++ b/PySide/QtGui/glue/qlayout_help_functions.h
@@ -28,7 +28,7 @@ inline void addLayoutOwnership(QLayout* layout, QWidget* widget)
 
 inline void addLayoutOwnership(QLayout* layout, QLayout* other)
 {
-    //transfer all children widgetes from other to layout parent widget
+    //transfer all children widgets from other to layout parent widget
     QWidget* parent = layout->parentWidget();
     if (!parent) {
         //keep the reference while the layout is orphan
@@ -39,7 +39,11 @@ inline void addLayoutOwnership(QLayout* layout, QLayout* other)
     }
 
     for (int i=0, i_max=other->count(); i < i_max; i++) {
-        addLayoutOwnership(layout, other->itemAt(i));
+        QLayoutItem* item = layout->itemAt(i);
+        if (PyErr_Occurred())
+            return;
+
+        addLayoutOwnership(layout, item);
     }
 
     Shiboken::AutoDecRef pyParent(Shiboken::Converter<QLayout*>::toPython(layout));