Fixed a crash in QgsMapLayerModel (when opening a new project)

wonder-sk · wonder-sk · commit 54ce9a0ec38a · 2014-04-17T12:37:56.000+02:00
diff --git a/src/gui/qgsmaplayermodel.cpp b/src/gui/qgsmaplayermodel.cpp
@@ -28,7 +28,7 @@ QgsMapLayerModel::QgsMapLayerModel( QList<QgsMapLayer *> layers, QObject *parent
     , mLayersChecked( QMap<QString, Qt::CheckState>() )
     , mItemCheckable( false )
 {
-  connect( QgsMapLayerRegistry::instance(), SIGNAL( layersRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );
+  connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );
   addLayers( layers );
 }
 
@@ -38,7 +38,7 @@ QgsMapLayerModel::QgsMapLayerModel( QObject *parent )
     , mItemCheckable( false )
 {
   connect( QgsMapLayerRegistry::instance(), SIGNAL( layersAdded( QList<QgsMapLayer*> ) ), this, SLOT( addLayers( QList<QgsMapLayer*> ) ) );
-  connect( QgsMapLayerRegistry::instance(), SIGNAL( layersRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );
+  connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );
   addLayers( QgsMapLayerRegistry::instance()->mapLayers().values() );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ QgsMapLayerModel::QgsMapLayerModel( QList<QgsMapLayer > layers, QObject parent`
`28`	`28`	`, mLayersChecked( QMap<QString, Qt::CheckState>() )`
`29`	`29`	`, mItemCheckable( false )`
`30`	`30`	`{`
`31`		`- connect( QgsMapLayerRegistry::instance(), SIGNAL( layersRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );`
	`31`	`+ connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );`
`32`	`32`	`addLayers( layers );`
`33`	`33`	`}`
`34`	`34`
`@@ -38,7 +38,7 @@ QgsMapLayerModel::QgsMapLayerModel( QObject *parent )`
`38`	`38`	`, mItemCheckable( false )`
`39`	`39`	`{`
`40`	`40`	`connect( QgsMapLayerRegistry::instance(), SIGNAL( layersAdded( QList<QgsMapLayer> ) ), this, SLOT( addLayers( QList<QgsMapLayer> ) ) );`
`41`		`- connect( QgsMapLayerRegistry::instance(), SIGNAL( layersRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );`
	`41`	`+ connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ), this, SLOT( removeLayers( QStringList ) ) );`
`42`	`42`	`addLayers( QgsMapLayerRegistry::instance()->mapLayers().values() );`
`43`	`43`	`}`
`44`	`44`