More load raster style fixes

qgis · Apr 18, 2012 · 746fe64 · 746fe64
1 parent 4f4a3ba
commit 746fe64
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -1464,8 +1464,12 @@ void QgsRasterLayerProperties::on_pbnLoadDefaultStyle_clicked()
   //reset if the default style was loaded ok only
   if ( defaultLoadedFlag )
   {
-    //it worked so do it quietly
-    sync();
+    QgsRasterRenderer* renderer = mRasterLayer->renderer();
+    if ( renderer )
+    {
+      setRendererWidget( renderer->type() );
+    }
+    mRasterLayer->triggerRepaint();
   }
   else
   {
@@ -1516,20 +1520,18 @@ void QgsRasterLayerProperties::on_pbnLoadStyle_clicked()
   QString message = mRasterLayer->loadNamedStyle( fileName, defaultLoadedFlag );
   if ( defaultLoadedFlag )
   {
-    sync();
+    settings.setValue( "style/lastStyleDir", QFileInfo( fileName ).absolutePath() );
+    QgsRasterRenderer* renderer = mRasterLayer->renderer();
+    if ( renderer )
+    {
+      setRendererWidget( renderer->type() );
+    }
+    mRasterLayer->triggerRepaint();
   }
   else
   {
     QMessageBox::information( this, tr( "Saved Style" ), message );
   }
-
-  settings.setValue( "style/lastStyleDir", QFileInfo( fileName ).absolutePath() );
-  QgsRasterRenderer* renderer = mRasterLayer->renderer();
-  if ( renderer )
-  {
-    setRendererWidget( renderer->type() );
-  }
-  mRasterLayer->triggerRepaint();
 }