Small fixes

* Fix minor memory leak in attribute dialog * Safety check in dual view
qgis · May 17, 2013 · 7b1d9e0 · 7b1d9e0
1 parent 5009aad
commit 7b1d9e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -31,6 +31,7 @@
 
 QgsDualView::QgsDualView( QWidget* parent )
     : QStackedWidget( parent )
+    , mAttributeDialog( NULL )
     , mProgressDlg( NULL )
 {
   setupUi( this );
@@ -258,7 +259,7 @@ void QgsDualView::setCurrentEditSelection( const QgsFeatureIds& fids )
 
 void QgsDualView::saveEditChanges()
 {
-  if ( mAttributeDialog->dialog() )
+  if ( mAttributeDialog && mAttributeDialog->dialog() )
   {
     if ( mLayerCache->layer()->isEditable() )
     {

diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -179,7 +179,7 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
       if ( !myWidget )
         continue;
 
-      QLabel * mypLabel = new QLabel();
+      QLabel * mypLabel = new QLabel( mypInnerFrame );
       mypInnerLayout->addWidget( mypLabel, index, 0 );
       if ( myFieldType == QVariant::Int )
       {