From 38b52de9378736ef4fb269e9be65253edbcdb497 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 18 Feb 2006 17:25:58 +0000 Subject: [PATCH] Hopefully fixed the build when not using Message4. As Message4 works well and is less broken than the older implementation we should maybe switch to it completely. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16461 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Looper.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/kits/app/Looper.cpp b/src/kits/app/Looper.cpp index 43b43b3736..61d0a4aa29 100644 --- a/src/kits/app/Looper.cpp +++ b/src/kits/app/Looper.cpp @@ -1171,6 +1171,7 @@ BLooper::ConvertToMessage(void *buffer, int32 code) return NULL; BMessage *message = new BMessage(); +#ifdef USING_MESSAGE4 if (code == kPortMessageCodeByArea) { BMessage::Private messagePrivate(message); if (messagePrivate.Reference((BMessage::message_header *)buffer) != B_OK) { @@ -1178,12 +1179,15 @@ BLooper::ConvertToMessage(void *buffer, int32 code) delete message; message = NULL; } - } else { - if (message->Unflatten((const char *)buffer) != B_OK) { - PRINT(("BLooper::ConvertToMessage(): unflattening message failed\n")); - delete message; - message = NULL; - } + + return message; + } +#endif + + if (message->Unflatten((const char *)buffer) != B_OK) { + PRINT(("BLooper::ConvertToMessage(): unflattening message failed\n")); + delete message; + message = NULL; } PRINT(("BLooper::ConvertToMessage(): %p\n", message));