Skip to content

move deletion to deleteMarkedListeners #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+5 −4
Open

move deletion to deleteMarkedListeners #188

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57a66c4
move deletion to deleteMarkedListeners
thomasjball Nov 21, 2025
1c0f490
whitespace
thomasjball Nov 21, 2025
4d4e966
add error
thomasjball Nov 21, 2025
5415dd4
remove compiler error
thomasjball Nov 21, 2025
4ac2a3a
try this
thomasjball Nov 21, 2025
b79d6e0
update
thomasjball Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions source/drivers/MessageBus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ int MessageBus::deleteMarkedListeners()
Listener *t = l;
l = l->next;

// If notification of deletion has been requested, invoke the listener deletion callback.
if (listener_deletion_callback)
listener_deletion_callback(t);

delete t;
removed++;

Expand Down Expand Up @@ -520,10 +524,6 @@ int MessageBus::remove(Listener *listener)
{
if ((listener->id == DEVICE_ID_ANY || listener->id == l->id) && (listener->value == DEVICE_EVT_ANY || listener->value == l->value))
{
// If notification of deletion has been requested, invoke the listener deletion callback.
if (listener_deletion_callback)
listener_deletion_callback(l);

// Found a match. mark this to be removed from the list.
l->flags |= MESSAGE_BUS_LISTENER_DELETING;
removed++;
Expand Down