detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 08:10:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
Erik Frojdh 2018-10-10 11:55:49 +02:00
commit 938dd5e06c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/src/Listener.cpp
View File

@ -227,8 +227,10 @@ void Listener::ShutDownUDPSocket() {
udpSocket->ShutDownSocket();
FILE_LOG(logINFO) << "Shut down of UDP port " << *udpPortNumber;
fflush(stdout);
//delete socket at stoplistening
sem_wait(&semaphore_socket);
// wait only if the threads have started as it is the threads that
//give a post to semaphore(at stopListening)
if (runningFlag)
sem_wait(&semaphore_socket);
delete udpSocket;
udpSocket = 0;
sem_destroy(&semaphore_socket);

2
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -1039,7 +1039,7 @@ int slsReceiverImplementation::startReceiver(char *c) {
//processor->writer
if (fileWriteEnable) {
if (SetupWriter() == FAIL) {
strcpy(c,"Could not create file.");
strcpy(c,"Could not create file.\n");
FILE_LOG(logERROR) << c;
return FAIL;
}