From 1daa34ec2c0d7a2980a610b144de0e146776b8f0 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 12 Mar 2006 12:35:26 +0000 Subject: [PATCH] Fixed two small errors that prevented _NativeFlatten() from working. Should fix at least the Deskbar and shutdown issues of bug 295. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16732 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Message.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp index e387a8b35e..3b243dfe05 100644 --- a/src/kits/app/Message.cpp +++ b/src/kits/app/Message.cpp @@ -850,14 +850,14 @@ BMessage::_NativeFlatten(BDataIO *stream, ssize_t *size) const ssize_t result2 = 0; if (fHeader->fields_size > 0) { - stream->Write(fFields, fHeader->fields_size); + result2 = stream->Write(fFields, fHeader->fields_size); if (result2 != fHeader->fields_size) return (result2 >= 0 ? B_ERROR : result2); } ssize_t result3 = 0; if (fHeader->data_size > 0) { - stream->Write(fData, fHeader->data_size); + result3 = stream->Write(fData, fHeader->data_size); if (result3 != fHeader->data_size) return (result3 >= 0 ? B_ERROR : result3); } @@ -1988,6 +1988,7 @@ BMessage::_SendFlattenedMessage(void *data, int32 size, port_id port, if (magic == kMessageMagicHaiku || magic == kMessageMagicHaikuSwapped) { message_header *header = (message_header *)data; header->target = token; + header->flags |= MESSAGE_FLAG_WAS_DELIVERED; } else if (magic == kMessageMagicR5) { uint8 *header = (uint8 *)data; header += sizeof(uint32) /* magic */ + sizeof(uint32) /* checksum */