From 8f70123737072f843c618179053ce2d3e9ce499a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 8 Dec 2009 15:31:08 +0000 Subject: [PATCH] * Obviously not one of my best days today: the SERVER_GET_MEDIA_FILE_{ITEMS|TYPES} commands used a mix of old and new transfer_area() semantics, which didn't work out too well. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34558 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/media/media_server.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/servers/media/media_server.cpp b/src/servers/media/media_server.cpp index b266ecd64b..00749505f9 100644 --- a/src/servers/media/media_server.cpp +++ b/src/servers/media/media_server.cpp @@ -724,13 +724,13 @@ ServerApp::_HandleMessage(int32 code, void* data, size_t size) data); server_get_media_types_reply reply; - reply.area = gMediaFilesManager->GetTypesArea(reply.count); - if (reply.area >= 0) { + area_id area = gMediaFilesManager->GetTypesArea(reply.count); + if (area >= 0) { // transfer the area to the target team - status_t status = _kern_transfer_area(reply.area, - &reply.address, B_ANY_ADDRESS, request.team); - if (status != B_OK) { - delete_area(reply.area); + reply.area = _kern_transfer_area(area, &reply.address, + B_ANY_ADDRESS, request.team); + if (reply.area < 0) { + delete_area(area); reply.area = B_ERROR; reply.count = 0; } @@ -756,8 +756,8 @@ ServerApp::_HandleMessage(int32 code, void* data, size_t size) reply.count); if (area >= 0) { // transfer the area to the target team - reply.area = _kern_transfer_area(reply.area, - &reply.address, B_ANY_ADDRESS, request.team); + reply.area = _kern_transfer_area(area, &reply.address, + B_ANY_ADDRESS, request.team); if (reply.area < 0) { delete_area(area); reply.area = B_ERROR;