map layer combo: emit signal on setLayer even if index is not changed

qgis · May 6, 2014 · ac2c742 · ac2c742
1 parent 41ccfb9
commit ac2c742
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/gui/qgsmaplayercombobox.cpp b/src/gui/qgsmaplayercombobox.cpp
@@ -22,7 +22,7 @@ QgsMapLayerComboBox::QgsMapLayerComboBox( QWidget *parent ) :
   mProxyModel = new QgsMapLayerProxyModel( this );
   setModel( mProxyModel );
 
-  connect( this, SIGNAL( currentIndexChanged( int ) ), this, SLOT( indexChanged( int ) ) );
+  connect( this, SIGNAL( activated( int ) ), this, SLOT( indexChanged( int ) ) );
 }
 
 void QgsMapLayerComboBox::setFilters( QgsMapLayerProxyModel::Filters filters )
@@ -43,6 +43,8 @@ void QgsMapLayerComboBox::setLayer( QgsMapLayer *layer )
     }
   }
   setCurrentIndex( -1 );
+
+  emit layerChanged( currentLayer() );
 }
 
 QgsMapLayer* QgsMapLayerComboBox::currentLayer()
@@ -75,5 +77,3 @@ void QgsMapLayerComboBox::indexChanged( int i )
   QgsMapLayer* layer = currentLayer();
   emit layerChanged( layer );
 }
-
-