From 9b9d1e82f4e17fc7b8fa000f88782dbb95165e64 Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Tue, 7 Mar 2006 14:47:45 +0000 Subject: [PATCH] modified to allow handling of messages without data git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16630 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/media/MediaNode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kits/media/MediaNode.cpp b/src/kits/media/MediaNode.cpp index e9dbcea9da..ad7435792f 100644 --- a/src/kits/media/MediaNode.cpp +++ b/src/kits/media/MediaNode.cpp @@ -358,12 +358,12 @@ BMediaNode::WaitForMessage(bigtime_t waitUntil, ssize_t size; size = read_port_etc(ControlPort(), &message, data, sizeof(data), B_ABSOLUTE_TIMEOUT, waitUntil); - if (size <= 0) { - if (size == 0 && message == 0) - return B_OK; // a null message was received (to unblock the read) + if (size < 0) { if (size != B_TIMED_OUT) ERROR("BMediaNode::WaitForMessage: read_port_etc error 0x%08lx\n",size); - return size; // returns the error code + return size; // return the error code + } else if (size == 0 && message == 0) { + return B_OK; // a null message was received (to unblock the read) } PRINT(7, "BMediaNode::WaitForMessage %#lx, node %ld, this %p\n", message, fNodeID, this);