Make sure a widget is initialized when creating a widget wrapper

Fix #10357
qgis · May 27, 2014 · 37c1cad · 37c1cad
1 parent 644dd13
commit 37c1cad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -44,10 +44,14 @@ QgsEditorWidgetWrapper* QgsEditorWidgetRegistry::create( const QString& widgetId
   if ( mWidgetFactories.contains( widgetId ) )
   {
     QgsEditorWidgetWrapper* ww = mWidgetFactories[widgetId]->create( vl, fieldIdx, editor, parent );
+
     if ( ww )
     {
       ww->setConfig( config );
       ww->setContext( context );
+      // Make sure that there is a widget created at this point
+      // so setValue() et al won't crash
+      ww->widget();
       return ww;
     }
   }

diff --git a/src/gui/editorwidgets/core/qgswidgetwrapper.cpp b/src/gui/editorwidgets/core/qgswidgetwrapper.cpp
@@ -62,7 +62,7 @@ const QgsEditorWidgetConfig QgsWidgetWrapper::config()
   return mConfig;
 }
 
-const QgsAttributeEditorContext&QgsWidgetWrapper::context()
+const QgsAttributeEditorContext& QgsWidgetWrapper::context()
 {
   return mContext;
 }