qgis · Nov 5, 2018
diff --git a/‎src/app/qgshandlebadlayers.cpp
Lines changed: 13 additions & 1 deletion b/‎src/app/qgshandlebadlayers.cpp
Lines changed: 13 additions & 1 deletion
diff --git a/‎tests/testdata/projects/bad_layers_test.gpkg
0 Bytes b/‎tests/testdata/projects/bad_layers_test.gpkg
0 Bytes
@@ -26,6 +26,7 @@
 #include "qgsproviderregistry.h"
 #include "qgsmessagebar.h"
 #include "qgssettings.h"
+#include "qgslayertreeregistrybridge.h"
 
 #include <QDomDocument>
 #include <QDomElement>
@@ -347,13 +348,17 @@ void QgsHandleBadLayers::editAuthCfg()
 
 void QgsHandleBadLayers::apply()
 {
+  QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( true );
+
   QList<QgsMapLayer *> toRemove;
   for ( const auto &l : QgsProject::instance()->mapLayers( ) )
   {
     if ( ! l->isValid() )
       toRemove << l;
   }
+
   QgsProject::instance()->removeMapLayers( toRemove );
+
   for ( int i = 0; i < mLayerList->rowCount(); i++ )
   {
     int idx = mLayerList->item( i, 0 )->data( Qt::UserRole ).toInt();
@@ -372,11 +377,15 @@ void QgsHandleBadLayers::apply()
       item->setForeground( QBrush( Qt::red ) );
     }
   }
+  QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( false );
+
+  if ( mLayerList->rowCount() == 0 )
+    accept();
+
 }
 
 void QgsHandleBadLayers::accept()
 {
-  apply();
 
   if ( mLayerList->rowCount() > 0  &&
        QMessageBox::warning( this,
@@ -395,6 +404,9 @@ void QgsHandleBadLayers::accept()
     if ( ! l->isValid() )
       toRemove << l;
   }
+  QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( true );
+  QgsProject::instance()->removeMapLayers( toRemove );
+  QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( false );
   mLayerList->clear();
 
   QDialog::accept();
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include "qgsproviderregistry.h"`
`27`	`27`	`#include "qgsmessagebar.h"`
`28`	`28`	`#include "qgssettings.h"`
	`29`	`+#include "qgslayertreeregistrybridge.h"`
`29`	`30`
`30`	`31`	`#include <QDomDocument>`
`31`	`32`	`#include <QDomElement>`
`@@ -347,13 +348,17 @@ void QgsHandleBadLayers::editAuthCfg()`
`347`	`348`
`348`	`349`	`void QgsHandleBadLayers::apply()`
`349`	`350`	`{`
	`351`	`+ QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( true );`
	`352`	`+`
`350`	`353`	`QList<QgsMapLayer *> toRemove;`
`351`	`354`	`for ( const auto &l : QgsProject::instance()->mapLayers( ) )`
`352`	`355`	`{`
`353`	`356`	`if ( ! l->isValid() )`
`354`	`357`	`toRemove << l;`
`355`	`358`	`}`
	`359`	`+`
`356`	`360`	`QgsProject::instance()->removeMapLayers( toRemove );`
	`361`	`+`
`357`	`362`	`for ( int i = 0; i < mLayerList->rowCount(); i++ )`
`358`	`363`	`{`
`359`	`364`	`int idx = mLayerList->item( i, 0 )->data( Qt::UserRole ).toInt();`
`@@ -372,11 +377,15 @@ void QgsHandleBadLayers::apply()`
`372`	`377`	`item->setForeground( QBrush( Qt::red ) );`
`373`	`378`	`}`
`374`	`379`	`}`
	`380`	`+ QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( false );`
	`381`	`+`
	`382`	`+ if ( mLayerList->rowCount() == 0 )`
	`383`	`+ accept();`
	`384`	`+`
`375`	`385`	`}`
`376`	`386`
`377`	`387`	`void QgsHandleBadLayers::accept()`
`378`	`388`	`{`
`379`		`- apply();`
`380`	`389`
`381`	`390`	`if ( mLayerList->rowCount() > 0 &&`
`382`	`391`	`QMessageBox::warning( this,`
`@@ -395,6 +404,9 @@ void QgsHandleBadLayers::accept()`
`395`	`404`	`if ( ! l->isValid() )`
`396`	`405`	`toRemove << l;`
`397`	`406`	`}`
	`407`	`+ QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( true );`
	`408`	`+ QgsProject::instance()->removeMapLayers( toRemove );`
	`409`	`+ QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( false );`
`398`	`410`	`mLayerList->clear();`
`399`	`411`
`400`	`412`	`QDialog::accept();`