Avoid recursive locks

qgis · Dec 5, 2016 · 01d6afa · 01d6afa
1 parent 14b6b3f
commit 01d6afa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/core/qgstaskmanager.cpp b/src/core/qgstaskmanager.cpp
@@ -279,12 +279,12 @@ void QgsTask::terminated()
 
 QgsTaskManager::QgsTaskManager( QObject* parent )
     : QObject( parent )
-    , mTaskMutex( new QReadWriteLock( QReadWriteLock::Recursive ) )
-    , mActiveTaskMutex( new QReadWriteLock( QReadWriteLock::Recursive ) )
-    , mParentTaskMutex( new QReadWriteLock( QReadWriteLock::Recursive ) )
-    , mSubTaskMutex( new QReadWriteLock( QReadWriteLock::Recursive ) )
-    , mDependenciesMutex( new QReadWriteLock( QReadWriteLock::Recursive ) )
-    , mLayerDependenciesMutex( new QReadWriteLock( QReadWriteLock::Recursive ) )
+    , mTaskMutex( new QReadWriteLock() )
+    , mActiveTaskMutex( new QReadWriteLock() )
+    , mParentTaskMutex( new QReadWriteLock() )
+    , mSubTaskMutex( new QReadWriteLock() )
+    , mDependenciesMutex( new QReadWriteLock() )
+    , mLayerDependenciesMutex( new QReadWriteLock() )
     , mNextTaskId( 0 )
 {
   connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ),

diff --git a/tests/src/core/testqgstaskmanager.cpp b/tests/src/core/testqgstaskmanager.cpp
@@ -24,7 +24,7 @@
 #include <QtTest/QtTest>
 
 //enable to allow fragile tests which intermittently fail
-//#define WITH_FLAKY_TESTS
+#define WITH_FLAKY_TESTS
 
 class TestTask : public QgsTask
 {