Fix creation of feature sinks when using windows style paths

qgis · Jun 22, 2017 · d8c44cb · d8c44cb
1 parent 9d8118c
commit d8c44cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/core/processing/qgsprocessingutils.cpp b/src/core/processing/qgsprocessingutils.cpp
@@ -229,7 +229,7 @@ QString QgsProcessingUtils::normalizeLayerSource( const QString &source )
 
 void parseDestinationString( QString &destination, QString &providerKey, QString &uri, QString &format, QMap<QString, QVariant> &options )
 {
-  QRegularExpression splitRx( "^(.*?):(.*)$" );
+  QRegularExpression splitRx( "^(.{3,}):(.*)$" );
   QRegularExpressionMatch match = splitRx.match( destination );
   if ( match.hasMatch() )
   {

diff --git a/tests/src/core/testqgsprocessing.cpp b/tests/src/core/testqgsprocessing.cpp
@@ -1135,6 +1135,11 @@ void TestQgsProcessing::createFeatureSink()
   QCOMPARE( layer->featureCount(), 1L );
   delete layer;
   layer = nullptr;
+
+  //windows style path
+  destination = "d:\\temp\\create_feature_sink.tab";
+  sink.reset( QgsProcessingUtils::createFeatureSink( destination, context, fields, QgsWkbTypes::Polygon, QgsCoordinateReferenceSystem::fromEpsgId( 3111 ) ) );
+  QVERIFY( sink.get() );
 }
 
 void TestQgsProcessing::parameters()