Fix crash when concurrent rendering operations occur

qgis · Mar 1, 2017 · f354a85 · f354a85
1 parent 809d30f
commit f354a85
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/core/qgspropertycollection.cpp b/src/core/qgspropertycollection.cpp
@@ -96,6 +96,28 @@ QgsPropertyCollection::QgsPropertyCollection( const QString& name )
     , mHasDynamicProperties( false )
 {}
 
+QgsPropertyCollection::QgsPropertyCollection( const QgsPropertyCollection& other )
+    : QgsAbstractPropertyCollection( other )
+    , mProperties( other.mProperties )
+    , mDirty( other.mDirty )
+    , mHasActiveProperties( other.mHasActiveProperties )
+    , mHasDynamicProperties( other.mHasDynamicProperties )
+    , mCount( other.mCount )
+{
+  mProperties.detach();
+}
+
+QgsPropertyCollection&QgsPropertyCollection::operator=( const QgsPropertyCollection & other )
+{
+  mProperties = other.mProperties;
+  mProperties.detach();
+  mDirty = other.mDirty;
+  mHasActiveProperties = other.mHasActiveProperties;
+  mHasDynamicProperties = other.mHasDynamicProperties;
+  mCount = other.mCount;
+  return *this;
+}
+
 int QgsPropertyCollection::count() const
 {
   if ( !mDirty )

diff --git a/src/core/qgspropertycollection.h b/src/core/qgspropertycollection.h
@@ -260,6 +260,13 @@ class CORE_EXPORT QgsPropertyCollection : public QgsAbstractPropertyCollection
      */
     QgsPropertyCollection( const QString& name = QString() );
 
+    /**
+     * Copy constructor.
+     */
+    QgsPropertyCollection( const QgsPropertyCollection& other );
+
+    QgsPropertyCollection& operator=( const QgsPropertyCollection& other );
+
     /**
      * Returns the number of properties contained within the collection.
      */