From f816742b659d2eb601e08f0d9a4dc5d08f3d18a3 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Fri, 27 Apr 2012 00:17:00 -0700 Subject: [PATCH] OSC: Don't fail if peer scan callback is not set! --- nonlib/OSC/Endpoint.C | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nonlib/OSC/Endpoint.C b/nonlib/OSC/Endpoint.C index c8e338a..2fc4bbd 100644 --- a/nonlib/OSC/Endpoint.C +++ b/nonlib/OSC/Endpoint.C @@ -306,7 +306,8 @@ namespace OSC DMESSAGE( "Peer %s has disconnected from signal %s", p->name, ps->path() ); - s->_connection_state_callback( s, s->_connection_state_userdata ); + if ( s->_connection_state_callback ) + s->_connection_state_callback( s, s->_connection_state_userdata ); return 0; } @@ -358,7 +359,8 @@ namespace OSC /* make a record of it ourselves */ ps->_outgoing.push_back( s ); - s->_connection_state_callback( s, s->_connection_state_userdata ); + if ( s->_connection_state_callback ) + s->_connection_state_callback( s, s->_connection_state_userdata ); /* return 0; */ /* } */ @@ -874,7 +876,8 @@ namespace OSC p->_scanning = false; DMESSAGE( "Done scanning %s", p->name ); - ep->_peer_scan_complete_callback(ep->_peer_scan_complete_userdata); + if ( ep->_peer_scan_complete_callback ) + ep->_peer_scan_complete_callback(ep->_peer_scan_complete_userdata); } else if ( argc == 7 && p->_scanning ) {