jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get client stop function working

Browse source
This commit is contained in:
Adam Honse 2020-05-14 10:06:18 -05:00
parent d843b3d619
commit bd6ec4c41e
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
NetworkClient.cpp
View file

@ -100,6 +100,8 @@ void NetworkClient::StartClient()
port.tcp_client(port_ip, port_str);
client_active = true;
//Start the connection thread
ConnectionThread = new std::thread(&NetworkClient::ConnectionThreadFunction, this);
@ -111,7 +113,18 @@ void NetworkClient::StartClient()
void NetworkClient::StopClient()
{
server_connected = false;
client_active = false;
shutdown(client_sock, SD_RECEIVE);
closesocket(client_sock);
ListenThread->join();
ConnectionThread->join();
/*-------------------------------------------------*\
| Client info has changed, call the callbacks |
\*-------------------------------------------------*/
ClientInfoChanged();
}
void NetworkClient::ConnectionThreadFunction()
@ -119,7 +132,7 @@ void NetworkClient::ConnectionThreadFunction()
unsigned int requested_controllers;
//This thread manages the connection to the server
while(1)
while(client_active == true)
{
if(server_connected == false)
{
@ -243,7 +256,7 @@ void NetworkClient::ListenThreadFunction()
{
printf("Network client listener started\n");
//This thread handles messages received from the server
while(server_connected = true)
while(server_connected == true)
{
NetPacketHeader header;
int bytes_read = 0;