Merge pull request #5936 from elpaso/bugfix-17724-virtuallayer-crash

[bugfix] Fix crash in virtual layers dlg when adding
qgis · Dec 22, 2017 · 02152ac · 02152ac
2 parents 224dcd0 + 385d0ef
commit 02152ac
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/providers/virtual/qgsvirtuallayersourceselect.cpp b/src/providers/virtual/qgsvirtuallayersourceselect.cpp
@@ -374,13 +374,18 @@ void QgsVirtualLayerSourceSelect::addButtonClicked()
       }
     }
   }
-  if ( replace )
-  {
-    emit replaceVectorLayer( id, def.toString(), layerName, QStringLiteral( "virtual" ) );
-  }
-  else
+  // This check is to prevent a crash, a proper implementation should handle
+  // the Add button state when a virtual layer definition is available
+  if ( ! def.toString().isEmpty() )
   {
-    emit addVectorLayer( def.toString(), layerName );
+    if ( replace )
+    {
+      emit replaceVectorLayer( id, def.toString(), layerName, QStringLiteral( "virtual" ) );
+    }
+    else
+    {
+      emit addVectorLayer( def.toString(), layerName );
+    }
   }
   if ( widgetMode() == QgsProviderRegistry::WidgetMode::None )
   {