[bugfix] Fix crash in virtual layers dlg when adding

elpaso · elpaso · commit 385d0ef94b50 · 2017-12-21T18:19:07.000+01:00
Fixes #17724 Crash on clicking ADD in Virtual Layer dialogue without defining a layer A proper implementation should handle the Add button state when a virtual layer definition is available.
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 )
   {

Original file line number	Diff line number	Diff line change
`@@ -374,13 +374,18 @@ void QgsVirtualLayerSourceSelect::addButtonClicked()`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`	`}`
`377`		`- if ( replace )`
`378`		`- {`
`379`		`- emit replaceVectorLayer( id, def.toString(), layerName, QStringLiteral( "virtual" ) );`
`380`		`- }`
`381`		`- else`
	`377`	`+ // This check is to prevent a crash, a proper implementation should handle`
	`378`	`+ // the Add button state when a virtual layer definition is available`
	`379`	`+ if ( ! def.toString().isEmpty() )`
`382`	`380`	`{`
`383`		`- emit addVectorLayer( def.toString(), layerName );`
	`381`	`+ if ( replace )`
	`382`	`+ {`
	`383`	`+ emit replaceVectorLayer( id, def.toString(), layerName, QStringLiteral( "virtual" ) );`
	`384`	`+ }`
	`385`	`+ else`
	`386`	`+ {`
	`387`	`+ emit addVectorLayer( def.toString(), layerName );`
	`388`	`+ }`
`384`	`389`	`}`
`385`	`390`	`if ( widgetMode() == QgsProviderRegistry::WidgetMode::None )`
`386`	`391`	`{`