From 60c52f2109aa028437e9636dbfffc0a5a7850836 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 12 Jul 2016 15:33:05 +0200 Subject: [PATCH] Fix crash on Windows fixes #11730 --- lib/base/socketevents-poll.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/base/socketevents-poll.cpp b/lib/base/socketevents-poll.cpp index 784212a16..3532f5658 100644 --- a/lib/base/socketevents-poll.cpp +++ b/lib/base/socketevents-poll.cpp @@ -55,6 +55,9 @@ void SocketEventEnginePoll::ThreadProc(int tid) typedef std::map::value_type kv_pair; BOOST_FOREACH(const kv_pair& desc, m_Sockets[tid]) { + if (desc.second.Events == 0) + continue; + if (desc.second.EventInterface) desc.second.EventInterface->m_EnginePrivate = &pfds[i]; @@ -65,6 +68,8 @@ void SocketEventEnginePoll::ThreadProc(int tid) i++; } + pfds.resize(i); + m_FDChanged[tid] = false; m_CV[tid].notify_all(); }