mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OSC: Fix signal lookup in removal notification handler. 

Closes #176
This commit is contained in:
Jonathan Moore Liles 2015-09-30 17:37:34 -07:00
parent c0113d1e7a
commit fe51e322f3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nonlib/OSC/Endpoint.C
View File

@ -435,8 +435,16 @@ namespace OSC
const char *name = &argv[0]->s; const char *name = &argv[0]->s;
Endpoint *ep = (Endpoint*)user_data; Endpoint *ep = (Endpoint*)user_data;
Peer *p = ep->find_peer_by_address( lo_message_get_source( msg ) );
Signal *o = ep->find_signal_by_path( name ); if ( ! p )
{
WARNING( "Got signal removed notification from unknown peer." );
return 0;
}
Signal *o = ep->find_peer_signal_by_path( p, name );
if ( ! o ) if ( ! o )
{ {
@ -450,7 +458,7 @@ namespace OSC
if ( ep->_peer_signal_notification_callback ) if ( ep->_peer_signal_notification_callback )
ep->_peer_signal_notification_callback( o, Signal::Removed, ep->_peer_signal_notification_userdata ); ep->_peer_signal_notification_callback( o, Signal::Removed, ep->_peer_signal_notification_userdata );
ep->_signals.remove( o ); p->_signals.remove(o);
delete o; delete o;