Fix cancellation on windows

qgis · Jan 8, 2021 · baad140 · baad140
1 parent ddf19ac
commit baad140
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/core/qgsrunprocess.cpp b/src/core/qgsrunprocess.cpp
@@ -291,7 +291,14 @@ int QgsBlockingProcess::run( QgsFeedback *feedback )
     if ( feedback )
       QObject::connect( feedback, &QgsFeedback::canceled, &p, [ &p]
     {
+#ifdef Q_OS_WIN
+      // From the qt docs:
+      // "Console applications on Windows that do not run an event loop, or whose
+      // event loop does not handle the WM_CLOSE message, can only be terminated by calling kill()."
+      p.kill();
+#else
       p.terminate();
+#endif
     } );
     connect( &p, qgis::overload< int, QProcess::ExitStatus >::of( &QProcess::finished ), this, [&loop, &result, &exitStatus]( int res, QProcess::ExitStatus st )
     {