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

Fix accidental overwrite using wrong symbol settings

Browse Source
This commit is contained in:
Nyall Dawson 2020-07-24 09:11:15 +10:00
parent a0e915fc50
commit f48a79ca85
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/3d/qgssymbol3dwidget.cpp
View File

@ -156,6 +156,8 @@ void QgsSymbol3DWidget::saveSymbol()
if ( saveDlg.name().isEmpty() )
return;
std::unique_ptr< QgsAbstract3DSymbol > newSymbol( symbol() );
// check if there is no symbol with same name
if ( QgsStyle::defaultStyle()->symbol3DNames().contains( saveDlg.name() ) )
{
@ -173,9 +175,9 @@ void QgsSymbol3DWidget::saveSymbol()
QStringList symbolTags = saveDlg.tags().split( ',' );
// add new symbol to style and re-populate the list
QgsAbstract3DSymbol *newSymbol = symbol();
QgsStyle::defaultStyle()->addSymbol3D( saveDlg.name(), newSymbol );
QgsAbstract3DSymbol *s = newSymbol.get();
QgsStyle::defaultStyle()->addSymbol3D( saveDlg.name(), newSymbol.release() );
// make sure the symbol is stored
QgsStyle::defaultStyle()->saveSymbol3D( saveDlg.name(), newSymbol, saveDlg.isFavorite(), symbolTags );
QgsStyle::defaultStyle()->saveSymbol3D( saveDlg.name(), s, saveDlg.isFavorite(), symbolTags );
}