Merge pull request #2587 from jvandenbroek/domoticztcp

Fix crash on stopping DomoticzTCP

Author: gizmocuz

hardware/DomoticzTCP.cpp

@@ -7,6 +7,10 @@
 #include "../main/WebServerHelper.h"
 #include "../webserver/proxyclient.h"
 
+#ifdef WIN32
+#define SHUT_RDWR SD_BOTH
+#endif
+
 #define RETRY_DELAY 30
 
 extern http::server::CWebServerHelper m_webservers;
@@ -147,20 +151,18 @@ bool DomoticzTCP::StopHardwareTCP()
 			//Don't throw from a Stop command
 		}
 	}
-	else {
-		try {
-			if (m_thread)
-			{
-				m_stoprequested = true;
-				m_thread->join();
-				m_thread.reset();
-			}
-		}
-		catch (...)
+	try {
+		if (m_thread)
 		{
-			//Don't throw from a Stop command
+			m_stoprequested = true;
+			m_thread->join();
+			m_thread.reset();
 		}
 	}
+	catch (...)
+	{
+		//Don't throw from a Stop command
+	}
 	m_bIsStarted = false;
 	return true;
 }
@@ -213,11 +215,10 @@ void DomoticzTCP::disconnectTCP()
 	m_stoprequested = true;
 	if (m_socket != INVALID_SOCKET)
 	{
+		shutdown(m_socket, SHUT_RDWR);
 		closesocket(m_socket);	//will terminate the thread
 		m_socket = INVALID_SOCKET;
-		sleep_seconds(1);
 	}
-	//m_thread-> join();
 }
 
 void DomoticzTCP::Do_Work()