Fix crashes in layout manager tests

qgis · Jan 24, 2018 · be95962 · be95962
1 parent b8880d4
commit be95962
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/core/layout/qgslayoutmanager.cpp b/src/core/layout/qgslayoutmanager.cpp
@@ -37,7 +37,7 @@ QgsLayoutManager::~QgsLayoutManager()
 
 bool QgsLayoutManager::addLayout( QgsMasterLayoutInterface *layout )
 {
-  if ( !layout )
+  if ( !layout || mLayouts.contains( layout ) )
     return false;
 
   // check for duplicate name
@@ -265,13 +265,12 @@ QgsMasterLayoutInterface *QgsLayoutManager::duplicateLayout( const QgsMasterLayo
 
   newLayout->setName( newName );
   QgsMasterLayoutInterface *l = newLayout.get();
-  if ( !addLayout( l ) )
+  if ( !addLayout( newLayout.release() ) )
   {
     return nullptr;
   }
   else
   {
-    ( void )newLayout.release(); //ownership was transferred successfully
     return l;
   }
 }