Don't throw exception when file downloader alg is canceled

qgis · Oct 25, 2017 · 016a8a2 · 016a8a2
1 parent c244368
commit 016a8a2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/analysis/processing/qgsalgorithmfiledownloader.cpp b/src/analysis/processing/qgsalgorithmfiledownloader.cpp
@@ -82,11 +82,12 @@ QVariantMap QgsFileDownloaderAlgorithm::processAlgorithm( const QVariantMap &par
   loop.exec();
 
   timer.stop();
-  if ( ! QFileInfo( outputFile ).exists() )
+  bool exists = QFileInfo( outputFile ).exists();
+  if ( !feedback->isCanceled() && !exists )
     throw QgsProcessingException( tr( "Output file doesn't exist." ) );
 
   QVariantMap outputs;
-  outputs.insert( QStringLiteral( "OUTPUT" ), outputFile );
+  outputs.insert( QStringLiteral( "OUTPUT" ), exists ? outputFile : QString() );
   return outputs;
 }