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

Merge branch 'developer' into separateRxr

Browse Source
This commit is contained in:
maliakal_d
2020-04-21 11:30:23 +02:00
parent 9df128fced c1ae67ac46
commit c408f9807a
7 changed files with 37 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/src/ClientInterface.cpp
View File

@ -315,10 +315,8 @@ int ClientInterface::set_port(Interface &socket) {
LOG(logINFO) << "TCP port set to " << p_number << std::endl;
sls::ServerSocket new_server(p_number);
// auto new_server = sls::make_unique<sls::ServerSocket>(p_number);
new_server.setLockedBy(server.getLockedBy());
new_server.setLastClient(server.getThisClient());
// server = std::move(new_server);
server = std::move(new_server);
socket.sendResult(p_number);
return OK;