From 686dc786d2564ff5de056278a89eb08f27a2d34e Mon Sep 17 00:00:00 2001
From: Jared Goodwin <translucency@outlook.com>
Date: Mon, 11 Mar 2024 05:18:27 -0700
Subject: [PATCH] Scope loader messages to the circuit connection.

---
 Server/Hubs/CircuitConnection.cs |  2 +-
 Server/Services/LoaderService.cs | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Server/Hubs/CircuitConnection.cs b/Server/Hubs/CircuitConnection.cs
index 6afd104d..8990a4b0 100644
--- a/Server/Hubs/CircuitConnection.cs
+++ b/Server/Hubs/CircuitConnection.cs
@@ -261,7 +261,7 @@ public class CircuitConnection : CircuitHandler, ICircuitConnection
                 "There are already the maximum amount of active remote control sessions for your organization.",
                 "Max number of concurrent sessions reached.",
                 "bg-warning");
-
+            
             await _messenger.Send(message, ConnectionId);
 
             return Result.Fail<RemoteControlSessionEx>("Max number of concurrent sessions reached.");
diff --git a/Server/Services/LoaderService.cs b/Server/Services/LoaderService.cs
index 67effd4a..9e93d687 100644
--- a/Server/Services/LoaderService.cs
+++ b/Server/Services/LoaderService.cs
@@ -1,8 +1,7 @@
 using Immense.RemoteControl.Shared.Primitives;
 using Immense.SimpleMessenger;
+using Remotely.Server.Hubs;
 using Remotely.Server.Models.Messages;
-using System;
-using System.Threading.Tasks;
 
 namespace Remotely.Server.Services;
 
@@ -12,23 +11,16 @@ public interface ILoaderService
     void HideLoader();
 }
 
-public class LoaderService : ILoaderService
+public class LoaderService(IMessenger _messenger, ICircuitConnection _circuitConnection) : ILoaderService
 {
-    private readonly IMessenger _messenger;
-
-    public LoaderService(IMessenger messenger)
-    {
-        _messenger = messenger;
-    }
-
     public async Task<IDisposable> ShowLoader(string statusMessage)
     {
-        await _messenger.Send(new ShowLoaderMessage(true, statusMessage));
+        await _messenger.Send(new ShowLoaderMessage(true, statusMessage), _circuitConnection.ConnectionId);
         return new CallbackDisposable(HideLoader);
     }
 
     public void HideLoader()
     {
-        _messenger.Send(new ShowLoaderMessage(false, string.Empty));
+        _messenger.Send(new ShowLoaderMessage(false, string.Empty), _circuitConnection.ConnectionId);
     }
 }
\ No newline at end of file