better error report from BDeskbar::RemoveItem(), though OpenDeskbar should be fixed too
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5219 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -337,6 +337,16 @@ status_t BDeskbar::RemoveItem(int32 id)
|
|||||||
if (result == B_OK) {
|
if (result == B_OK) {
|
||||||
result = fMessenger->SendMessage(&requestMessage, &replyMessage);
|
result = fMessenger->SendMessage(&requestMessage, &replyMessage);
|
||||||
}
|
}
|
||||||
|
/* here R5 returns B_OK always (probably the result of SendMessage())
|
||||||
|
* Deskbar itself also always return B_NO_REPLY, so ...
|
||||||
|
* here add some more checks for the future.
|
||||||
|
*/
|
||||||
|
if (result != B_OK)
|
||||||
|
return(result);
|
||||||
|
if (replyMessage.what == B_NO_REPLY)
|
||||||
|
return(B_OK); /* we can only speculate */
|
||||||
|
result = B_ERROR;
|
||||||
|
replyMessage.FindInt32("error", &result);
|
||||||
return(result);
|
return(result);
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
@@ -350,7 +360,15 @@ status_t BDeskbar::RemoveItem(const char *name)
|
|||||||
if (result == B_OK) {
|
if (result == B_OK) {
|
||||||
result = fMessenger->SendMessage(&requestMessage, &replyMessage);
|
result = fMessenger->SendMessage(&requestMessage, &replyMessage);
|
||||||
}
|
}
|
||||||
|
/* same as above */
|
||||||
|
if (result != B_OK)
|
||||||
return(result);
|
return(result);
|
||||||
|
if (replyMessage.what == B_NO_REPLY)
|
||||||
|
return(B_OK);
|
||||||
|
result = B_ERROR;
|
||||||
|
replyMessage.FindInt32("error", &result);
|
||||||
|
return(result);
|
||||||
|
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user