detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 09:37:59 +02:00
Code Issues Actions Packages Releases Activity

gui exception thrown from acquire caught properly in gui

Browse Source
This commit is contained in:
maliakal_d
2020-11-17 17:39:34 +01:00
parent 6563965787
commit 7fcac35549
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1079,13 +1079,13 @@ int DetectorImpl::acquire() {
}
}
startProcessingThread(receiver);
// start receiver
if (receiver) {
Parallel(&Module::startReceiver, {});
}
startProcessingThread(receiver);
// start and read all
try {
Parallel(&Module::startAndReadAll, {});
@ -1126,10 +1126,10 @@ int DetectorImpl::acquire() {
(end.tv_nsec - begin.tv_nsec) / 1000000000.0)
<< " seconds";
} catch (...) {
if (dataProcessingThread.joinable()){
if (dataProcessingThread.joinable()) {
setJoinThreadFlag(true);
dataProcessingThread.join();
}
}
setAcquiringFlag(false);
throw;
}