1 files changed, 4 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs
index ee045012d..411fd5252 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs
@@ -178,6 +178,7 @@ namespace Tango.PPC.Common.RemoteDesktop
             newClient.Receiver = receiver;
             newClient.Token = token;
             newClient.WebRtcClient = new WebRtcClient();
+            newClient.WebRtcClient.Tag = receiver;
             newClient.WebRtcClient.TextMessageReceived += WebRtcClient_TextMessageReceived;
             _clients.Add(newClient);
 
@@ -318,6 +319,7 @@ namespace Tango.PPC.Common.RemoteDesktop
 
                 if (!receiver.AllowSafetyLevelOperations)
                 {
+                    Debug.WriteLine("PREVENT PRINT");
                     _printingManager.PreventPrintingByRemoteDesktop = true;
                 }
 
@@ -326,6 +328,7 @@ namespace Tango.PPC.Common.RemoteDesktop
                 _resetTimer.ResetReplace(() => 
                 {
                     _printingManager.PreventPrintingByRemoteDesktop = false;
+                    Debug.WriteLine("ALLOW PRINT");
                 });
             }
             else if (request.EventType == MouseEventType.DoubleClick)
@@ -560,7 +563,7 @@ namespace Tango.PPC.Common.RemoteDesktop
 
                 if (request.GetType() == typeof(MouseStateRequest))
                 {
-                    await OnMouseStateRequestReceived(request as MouseStateRequest, null, null);
+                    await OnMouseStateRequestReceived(request as MouseStateRequest, null, (sender as WebRtcClient).Tag as ExternalBridgeReceiver);
                 }
                 else if (request.GetType() == typeof(KeyboardStateRequest))
                 {