From 1ba54b5b31f18f760c301f0ad4374e265bf4ab84 Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Tue, 1 Apr 2008 21:51:31 +0000 Subject: [PATCH] Fix correct handling of more than one event wanted in a single request git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24732 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/bluetooth/LocalDeviceHandler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/servers/bluetooth/LocalDeviceHandler.cpp b/src/servers/bluetooth/LocalDeviceHandler.cpp index 3c2cee88a8..b2b89c06dc 100644 --- a/src/servers/bluetooth/LocalDeviceHandler.cpp +++ b/src/servers/bluetooth/LocalDeviceHandler.cpp @@ -99,14 +99,14 @@ LocalDeviceHandler::ClearWantedEvent(BMessage* msg, uint16 event, uint16 opcode if ( (msg->FindInt16("opcodeExpected", eventIndex, &opcodeFound) == B_OK) && ((uint16)opcodeFound != opcode) ) { - // FIX: this should remove only the entry - fEventsWanted.RemoveMessage(msg); + // this should remove only the entry + (void)msg->RemoveData("eventExpected", eventIndex); + (void)msg->RemoveData("opcodeExpected", eventIndex); goto bail; } } else { - // Event matches so far - // FIX: this should remove only the entry - fEventsWanted.RemoveMessage(msg); + // Event matches so far + (void)msg->RemoveData("eventExpected", eventIndex); goto bail; }