sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crashes in layout manager tests

Browse Source
This commit is contained in:
Nyall Dawson 2018-01-24 07:01:17 +10:00
parent b8880d46cd
commit be959628e5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/layout/qgslayoutmanager.cpp
View File

@ -37,7 +37,7 @@ QgsLayoutManager::~QgsLayoutManager()
bool QgsLayoutManager::addLayout( QgsMasterLayoutInterface *layout ) bool QgsLayoutManager::addLayout( QgsMasterLayoutInterface *layout )
{ {
if ( !layout ) if ( !layout || mLayouts.contains( layout ) )
return false; return false;
// check for duplicate name // check for duplicate name
@ -265,13 +265,12 @@ QgsMasterLayoutInterface *QgsLayoutManager::duplicateLayout( const QgsMasterLayo
newLayout->setName( newName ); newLayout->setName( newName );
QgsMasterLayoutInterface *l = newLayout.get(); QgsMasterLayoutInterface *l = newLayout.get();
if ( !addLayout( l ) ) if ( !addLayout( newLayout.release() ) )
{ {
return nullptr; return nullptr;
} }
else else
{ {
( void )newLayout.release(); //ownership was transferred successfully
return l; return l;
} }
} }