summaryrefslogtreecommitdiff
path: root/tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
diff options
context:
space:
mode:
authorGuy Zadickario <guy@graphtech.co.il>2011-08-02 15:20:46 +0300
committerDavid 'Digit' Turner <digit@android.com>2011-08-10 10:11:13 +0200
commitded8587d2dead5c520f3c33a81dcd70ee6393c1a (patch)
tree2a5867e6e66f8c3d6334cd3e8dd5576781733d52 /tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
parent6bb9511365bb64772e35b8b7bfbb0fdbabb0cec4 (diff)
opengles emulator: Fixed Windows renderer termination
Make the event pump loop in the renderer process we do on Windows exit when the Framebuffer's subwindow is destroyed. Fixed TcpStream to close the socket using 'closesocket' on windows, otherwise the other end of the socket does not sense that the socket is closed. + Use WS_DISABLED to ensure that our GL subwindow doesn't receive any input events. Change-Id: Icb477b3e1d7993a8880acb5e01bc5da29309ae50
Diffstat (limited to 'tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp')
-rw-r--r--tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp b/tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
index f144a9f3b..4e947daa5 100644
--- a/tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
+++ b/tools/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
@@ -44,7 +44,11 @@ TcpStream::TcpStream(int sock, size_t bufSize) :
TcpStream::~TcpStream()
{
if (m_sock >= 0) {
+#ifdef _WIN32
+ closesocket(m_sock);
+#else
::close(m_sock);
+#endif
}
if (m_buf != NULL) {
free(m_buf);