diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 2d55ec180..5cf61d3fa 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git -Repsitory UUID: 4a4fcb049bd7ac2837af6de34598a13fab67b1e7 -Revision: 404 +Repsitory UUID: 30b27420ac4b43a80573d794009e3ee135f8d7f3 +Revision: 405 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 404 -Last Changed Date: 2017-07-11 11:46:42.000000002 +0200 ./Makefile.gui +Last Changed Rev: 405 +Last Changed Date: 2017-07-12 10:37:02.000000002 +0200 ./Makefile.gui diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 38d1a1209..bdadbb4d3 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "4a4fcb049bd7ac2837af6de34598a13fab67b1e7" -//#define SVNREV 0x404 +#define SVNREPUUID "30b27420ac4b43a80573d794009e3ee135f8d7f3" +//#define SVNREV 0x405 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x404 -#define SVNDATE 0x20170711 +#define SVNREV 0x405 +#define SVNDATE 0x20170712 // diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 96199852d..76f54321c 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -731,7 +731,8 @@ void* qDrawPlot::DataStartAcquireThread(void *this_pointer){ //stream data from receiver to the gui if(((qDrawPlot*)this_pointer)->myDet->setReceiverOnline(slsDetectorDefs::GET_ONLINE_FLAG) == slsDetectorDefs::ONLINE_FLAG) { //if it was not on - if (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingFromReceiver(-1)!= 1){ + if ( (((qDrawPlot*)this_pointer)->myDet->getStreamingSocketsCreatedInClient() != 1) + || (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingFromReceiver(-1)!= 1) ){ //switch it on, if error if (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingFromReceiver(1) != 1) { qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread");