Fix #10548 (crash using custom forms)

When using a custom UI file, the widget is created beforehand, and the code was failing to initialize it.
qgis · Jun 12, 2014 · d43d306 · d43d306
1 parent 4f91399
commit d43d306
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/gui/editorwidgets/core/qgswidgetwrapper.cpp b/src/gui/editorwidgets/core/qgswidgetwrapper.cpp
@@ -23,16 +23,20 @@ QgsWidgetWrapper::QgsWidgetWrapper( QgsVectorLayer* vl, QWidget* editor, QWidget
     , mWidget( editor )
     , mParent( parent )
     , mLayer( vl )
+    , mInitialized( false )
 {
 }
 
 QWidget* QgsWidgetWrapper::widget()
 {
   if ( !mWidget )
-  {
     mWidget = createWidget( mParent );
+
+  if ( !mInitialized )
+  {
     mWidget->setProperty( "EWV2Wrapper", QVariant::fromValue<QgsWidgetWrapper*>( this ) );
     initWidget( mWidget );
+    mInitialized = true;
   }
 
   return mWidget;

diff --git a/src/gui/editorwidgets/core/qgswidgetwrapper.h b/src/gui/editorwidgets/core/qgswidgetwrapper.h
@@ -163,6 +163,7 @@ class GUI_EXPORT QgsWidgetWrapper : public QObject
     QWidget* mWidget;
     QWidget* mParent;
     QgsVectorLayer* mLayer;
+    bool mInitialized;
 };
 
 // We'll use this class inside a QVariant in the widgets properties