Don't crash, please

qgis · Aug 24, 2018 · 79f766a · 79f766a
1 parent 308b16b
commit 79f766a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/core/qgsrelation.cpp b/src/core/qgsrelation.cpp
@@ -23,12 +23,11 @@
 #include "qgsrelation_p.h"
 
 QgsRelation::QgsRelation()
+  : d( new QgsRelationPrivate() )
 {
 }
 
-QgsRelation::~QgsRelation()
-{
-}
+QgsRelation::~QgsRelation() = default;
 
 QgsRelation::QgsRelation( const QgsRelation &other )
   : d( other.d )
@@ -326,7 +325,7 @@ QgsAttributeList QgsRelation::referencingFields() const
 
 bool QgsRelation::isValid() const
 {
-  return d->mValid && d->mReferencingLayer && d->mReferencedLayer;
+  return d->mValid && !d->mReferencingLayer.isNull() && !d->mReferencedLayer.isNull();
 }
 
 bool QgsRelation::hasEqualDefinition( const QgsRelation &other ) const

diff --git a/src/core/qgsrelation_p.h b/src/core/qgsrelation_p.h
@@ -39,7 +39,7 @@
 class QgsRelationPrivate : public QSharedData
 {
   public:
-    QgsRelationPrivate();
+    QgsRelationPrivate() = default;
 
     //! Unique Id
     QString mRelationId;