sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54060 from elpaso/bugfix-qgis_process-deadlock

Browse Source 
qgis_process: fix unreported deadlock
This commit is contained in:
Alessandro Pasotti 2023-08-04 16:46:20 +02:00 committed by GitHub
commit d05ddc5fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/processing/models/qgsprocessingmodelalgorithm.cpp
View File

@ -422,7 +422,7 @@ QVariantMap QgsProcessingModelAlgorithm::processAlgorithm( const QVariantMap &pa
QVariantMap results;
try
{
if ( childAlg->flags() & QgsProcessingAlgorithm::FlagNoThreading )
if ( ( childAlg->flags() & QgsProcessingAlgorithm::FlagNoThreading ) && ( QThread::currentThread() != qApp->thread() ) )
{
// child algorithm run step must be called on main thread
auto runOnMainThread = [modelThread, &context, &modelFeedback, &results, &childAlg, &childParams]