diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-07-06 11:20:36 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-07-06 11:20:36 +0200 |
| commit | 8fa6ec49c99e271e973a5a8c4a8967110f9eb77f (patch) | |
| tree | bb3511f7985a54b579e1b95f99427dba37370244 /cpp | |
| parent | Ignore errors from Windows PDB download failures (diff) | |
| download | ice-8fa6ec49c99e271e973a5a8c4a8967110f9eb77f.tar.bz2 ice-8fa6ec49c99e271e973a5a8c4a8967110f9eb77f.tar.xz ice-8fa6ec49c99e271e973a5a8c4a8967110f9eb77f.zip | |
Fixed ICE-8156 - iOS controller crash
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/Selector.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/ios/StreamTransceiver.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index e728bf4ef38..ebffee5325e 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -1114,7 +1114,6 @@ EventHandlerWrapper::updateRunLoop() if(_finish) { - CFRunLoopSourceInvalidate(_source.get()); CFSocketInvalidate(_socket.get()); } } diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp index cbdde8e25ab..cc0624fee78 100644 --- a/cpp/src/Ice/ios/StreamTransceiver.cpp +++ b/cpp/src/Ice/ios/StreamTransceiver.cpp @@ -169,7 +169,7 @@ IceObjC::StreamTransceiver::unregisterFromRunLoop(SocketOperation op, bool error if(_opening) { // Wait for the stream to be ready for write - if(op == SocketOperationWrite) + if(op & SocketOperationWrite) { _writeStreamRegistered = false; } @@ -182,7 +182,7 @@ IceObjC::StreamTransceiver::unregisterFromRunLoop(SocketOperation op, bool error // client to write the HTTP upgrade request. // //if(op & SocketOperationRead && (_fd != INVALID_SOCKET || !(op & SocketOperationConnect))) - if(op == (SocketOperationRead | SocketOperationConnect)) + if(op & (SocketOperationRead | SocketOperationConnect)) { _readStreamRegistered = false; } |