summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-09-28 07:51:59 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-09-28 07:51:59 +0200
commit6715f9b1858587db6aec826bdc9a7905bba8030e (patch)
treed31b623eca625428fe583cfd80a3f7cdec694b81 /src
parent16c3884a61b146040277ec61bfdbc553c883b4d6 (diff)
parentc1deb226f4d1bc94c158c050088813aae96775e9 (diff)
Merge branch 'maint'
* maint: crash when closing an ypipe -- fixed
Diffstat (limited to 'src')
-rw-r--r--src/ypipe.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ypipe.hpp b/src/ypipe.hpp
index 26f021c..1785b71 100644
--- a/src/ypipe.hpp
+++ b/src/ypipe.hpp
@@ -127,7 +127,7 @@ namespace zmq
inline bool check_read ()
{
// Was the value prefetched already? If so, return.
- if (&queue.front () != r)
+ if (&queue.front () != r && r)
return true;
// There's no prefetched value, so let us prefetch more values.