From 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 28 Mar 2015 01:43:35 +0100 Subject: Bump OculusVR RIFT SDK to 0.5.0.1 --- LibOVR/Src/Net/OVR_Unix_Socket.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'LibOVR/Src/Net/OVR_Unix_Socket.cpp') diff --git a/LibOVR/Src/Net/OVR_Unix_Socket.cpp b/LibOVR/Src/Net/OVR_Unix_Socket.cpp index 6f2a678..7477ee7 100644 --- a/LibOVR/Src/Net/OVR_Unix_Socket.cpp +++ b/LibOVR/Src/Net/OVR_Unix_Socket.cpp @@ -25,10 +25,10 @@ limitations under the License. ************************************************************************************/ #include "OVR_Unix_Socket.h" -#include "../Kernel/OVR_Std.h" -#include "../Kernel/OVR_Allocator.h" -#include "../Kernel/OVR_Threads.h" // Thread::MSleep -#include "../Kernel/OVR_Log.h" +#include "Kernel/OVR_Std.h" +#include "Kernel/OVR_Allocator.h" +#include "Kernel/OVR_Threads.h" // Thread::MSleep +#include "Kernel/OVR_Log.h" #include @@ -409,10 +409,14 @@ TCPSocket::TCPSocket(SocketHandle boundHandle, bool isListenSocket) TheSocket = boundHandle; IsListenSocket = isListenSocket; IsConnecting = false; - SetSocketOptions(TheSocket); - // The actual socket is always non-blocking - _Ioctlsocket(TheSocket, 1); + if (TheSocket != INVALID_SOCKET) + { + SetSocketOptions(TheSocket); + + // The actual socket is always non-blocking + _Ioctlsocket(TheSocket, 1); + } } TCPSocket::~TCPSocket() -- cgit v1.2.3