Fix #10548 (crash using custom forms)

wonder-sk · wonder-sk · commit d43d3065e912 · 2014-06-12T13:22:12.000+07:00
When using a custom UI file, the widget is created beforehand,
and the code was failing to initialize it.
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

Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,20 @@ QgsWidgetWrapper::QgsWidgetWrapper( QgsVectorLayer* vl, QWidget* editor, QWidget`
`23`	`23`	`, mWidget( editor )`
`24`	`24`	`, mParent( parent )`
`25`	`25`	`, mLayer( vl )`
	`26`	`+ , mInitialized( false )`
`26`	`27`	`{`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`QWidget* QgsWidgetWrapper::widget()`
`30`	`31`	`{`
`31`	`32`	`if ( !mWidget )`
`32`		`- {`
`33`	`33`	`mWidget = createWidget( mParent );`
	`34`	`+`
	`35`	`+ if ( !mInitialized )`
	`36`	`+ {`
`34`	`37`	`mWidget->setProperty( "EWV2Wrapper", QVariant::fromValue<QgsWidgetWrapper*>( this ) );`
`35`	`38`	`initWidget( mWidget );`
	`39`	`+ mInitialized = true;`
`36`	`40`	`}`
`37`	`41`
`38`	`42`	`return mWidget;`