Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix build
  • Loading branch information
alexbruy committed Apr 13, 2016
1 parent ca9f267 commit 2572d18
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/app/qgsvectorlayerproperties.cpp
Expand Up @@ -660,14 +660,14 @@ void QgsVectorLayerProperties::onCancel()
layer->setSubsetString( mOriginalSubsetSQL );
}

if ( mOldStyle.xmlData() != mLayer->styleManager()->style( mLayer->styleManager()->currentStyle() ).xmlData() )
if ( mOldStyle.xmlData() != layer->styleManager()->style( layer->styleManager()->currentStyle() ).xmlData() )
{
// need to reset style to previous - style applied directly to the layer (not in apply())
QString myMessage;
QDomDocument doc( "qgis" );
int errorLine, errorColumn;
doc.setContent( mOldStyle.xmlData(), false, &myMessage, &errorLine, &errorColumn );
mLayer->importNamedStyle( doc, myMessage );
layer->importNamedStyle( doc, myMessage );
syncToLayer();
}
}
Expand Down Expand Up @@ -836,7 +836,7 @@ void QgsVectorLayerProperties::loadStyle_clicked()
return;
}

mOldStyle = mLayer->styleManager()->style( mLayer->styleManager()->currentStyle() );
mOldStyle = layer->styleManager()->style( layer->styleManager()->currentStyle() );

QString myMessage;
bool defaultLoadedFlag = false;
Expand Down

0 comments on commit 2572d18

Please sign in to comment.