From dcb85833a34f2d64ed9999551a3efe311a6e1635 Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Sat, 4 Nov 2017 13:03:15 -0500 Subject: [PATCH] Remove unlock() and lock() around call to doCallbacksGenericPointer; not needed and can cause problems --- andorApp/src/andorCCD.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/andorApp/src/andorCCD.cpp b/andorApp/src/andorCCD.cpp index 7272a25..87e9588 100755 --- a/andorApp/src/andorCCD.cpp +++ b/andorApp/src/andorCCD.cpp @@ -1414,14 +1414,10 @@ void AndorCCD::dataTask(void) /* Get any attributes that have been defined for this driver */ this->getAttributes(pArray->pAttributeList); /* Call the NDArray callback */ - /* Must release the lock here, or we can get into a deadlock, because we can - * block on the plugin lock, and the plugin can be calling us */ - this->unlock(); asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW, "%s:%s:, calling array callbacks\n", driverName, functionName); doCallbacksGenericPointer(pArray, NDArrayData, 0); - this->lock(); // Save the current frame for use with the SPE file writer which needs the data if (this->pArrays[0]) this->pArrays[0]->release(); this->pArrays[0] = pArray;