diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-03-15 20:05:31 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-03-15 20:05:31 +0100 |
| commit | 2e4ba353940e5ee8344be331ac40d5da92030213 (patch) | |
| tree | 7f6e25a432541202f2800bbe42b022cbfa3cbcdb /cpp/src/Ice/Selector.cpp | |
| parent | ICE-8703 - Removing PHP_DEBUG config (diff) | |
| download | ice-2e4ba353940e5ee8344be331ac40d5da92030213.tar.bz2 ice-2e4ba353940e5ee8344be331ac40d5da92030213.tar.xz ice-2e4ba353940e5ee8344be331ac40d5da92030213.zip | |
Potential UWP fix to solve controller crashes (ICE-8713)
Diffstat (limited to 'cpp/src/Ice/Selector.cpp')
| -rw-r--r-- | cpp/src/Ice/Selector.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index e0c228ffcf9..52de030b469 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -118,10 +118,8 @@ Selector::finish(IceInternal::EventHandler* handler) #ifdef ICE_OS_UWP // If async operations are no longer pending, clear the completion handler to break // the cyclic reference count. - if(!handler->_started) - { - handler->getNativeInfo()->setCompletedHandler(nullptr); - } + assert(!handler->_started && !handler->_pending); + handler->getNativeInfo()->setCompletedHandler(nullptr); #endif handler->_registered = SocketOperationNone; handler->_finish = false; // Ensures that finished() is only called once on the event handler. |