projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Allow using wxGraphicsContext with MinGW if gdiplus.h is available.
[wxWidgets.git]
/
src
/
common
/
socket.cpp
diff --git
a/src/common/socket.cpp
b/src/common/socket.cpp
index 44b408c49cef9fe5ca76b19d86aa42fcf37cbfb2..228fe79a28d64f10c1ab23ed31520131e77621d4 100644
(file)
--- a/
src/common/socket.cpp
+++ b/
src/common/socket.cpp
@@
-1109,6
+1109,9
@@
wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
{
wxSocketReadGuard read(this);
+ // Peek() should never block
+ wxSocketWaitModeChanger changeFlags(this, wxSOCKET_NOWAIT);
+
m_lcount = DoRead(buffer, nbytes);
Pushback(buffer, m_lcount);