handle bad layers when custom layer order is set (fixes #12733)

jef-n · jef-n · commit 78c60a297c64 · 2015-06-11T18:52:42.000+02:00
diff --git a/src/gui/layertree/qgslayertreemapcanvasbridge.cpp b/src/gui/layertree/qgslayertreemapcanvasbridge.cpp
@@ -86,6 +86,17 @@ void QgsLayerTreeMapCanvasBridge::setCustomLayerOrder( const QStringList& order
   QStringList sortedNewOrder = order;
   qSort( defOrder );
   qSort( sortedNewOrder );
+
+  if ( defOrder.size() < sortedNewOrder.size() )
+  {
+    // some bad layers in the list?
+    for ( int i = 0; i < sortedNewOrder.size(); i++ )
+    {
+      if ( i >= defOrder.size() || defOrder[i] != sortedNewOrder[i] )
+        sortedNewOrder.removeAt( i-- );
+    }
+  }
+
   if ( defOrder != sortedNewOrder )
     return; // must be permutation of the default order
 
