From f15523ea9ee215e20072263ace90fce11de57fcc Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Thu, 23 Feb 2012 04:10:55 -0800
Subject: [PATCH] NSM: Mutli-server fixes.

---
 session/src/nsmd.C | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/session/src/nsmd.C b/session/src/nsmd.C
index c64225c..8870bda 100644
--- a/session/src/nsmd.C
+++ b/session/src/nsmd.C
@@ -1477,11 +1477,19 @@ OSC_HANDLER( broadcast )
      * propagated to another NSMD instance */
     if ( gui_is_active )
     {
-        new_args.push_front( OSC::OSC_String( to_path ) );
-
-        osc_server->send( gui_addr, path, new_args );
+        
+        char *u1 = lo_address_get_url( gui_addr );
+     
+        if ( strcmp( u1, sender_url ) )
+        {
+            new_args.push_front( OSC::OSC_String( to_path ) );
+            
+            osc_server->send( gui_addr, path, new_args );
+        }
+        
+        free(u1);
     }
-
+    
     free( sender_url );
 
     return 0;
@@ -1640,17 +1648,20 @@ OSC_HANDLER( remove )
 OSC_HANDLER( resume )
 {
     Client *c = get_client_by_id( &client, &argv[0]->s );
-
-    if ( c->pid == 0 &&
-         ! c->active )
+    
+    /* FIXME: return error if no such client? */
+    if ( c )
     {
-
-        if ( ! launch( c->executable_path, c->client_id ) )
+        if ( c->pid == 0 &&
+             ! c->active )
         {
-
+            if ( ! launch( c->executable_path, c->client_id ) )
+            {
+                
+            }
         }
     }
-
+    
     return 0;
 }
 
@@ -1659,9 +1670,13 @@ OSC_HANDLER( client_save )
 {
     Client *c = get_client_by_id( &client, &argv[0]->s );
 
-    if ( c->active )
+    /* FIXME: return error if no such client? */
+    if ( c )
     {
-        command_client_to_save( c );
+        if ( c->active )
+        {
+            command_client_to_save( c );
+        }
     }
 
     return 0;