i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed two small errors that prevented _NativeFlatten() from working. Should fix at least the Deskbar and shutdown issues of bug 295.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16732 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2006-03-12 12:35:26 +00:00
parent 56d17f07b9
commit 1daa34ec2c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Message.cpp
+3 -2
View File
@@ -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 */