Update tui to reflect changes to start method

amdzy · Apr 14, 2024 · 8243130 · 8243130
1 parent 44c536b
commit 8243130
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/NetWarden.Tui/Controllers/MainController.cs b/NetWarden.Tui/Controllers/MainController.cs
@@ -22,11 +22,6 @@ public MainController(Core.NetWarden netWarden)
         _netWarden.ClientsChanged += OnClientsChanged;
     }
 
-    public void Start()
-    {
-        _netWarden?.Start();
-    }
-
     public void Exit()
     {
         _netWarden.StopScan();
@@ -130,7 +125,7 @@ public DataTable GetTableData()
 
     private void UpdateClients()
     {
-        Clients = _netWarden.GetClients();
+        Clients = _netWarden.GetClients() ?? [];
         ClientsChanged?.Invoke(this, EventArgs.Empty);
     }
 

diff --git a/NetWarden.Tui/Program.cs b/NetWarden.Tui/Program.cs
@@ -19,9 +19,9 @@ public static void Main(string[] args)
 
             Application.Init();
 
-            var netWarden = GetWarden();
+            var netWarden = new Core.NetWarden();
+            InitWarden(netWarden);
             var controller = new MainController(netWarden);
-            controller.Start();
 
             Application.Run(new MainView(controller));
         }
@@ -36,18 +36,16 @@ public static void Main(string[] args)
 
     }
 
-    private static Core.NetWarden GetWarden()
+    private static void InitWarden(Core.NetWarden netWarden)
     {
         try
         {
-            var netWarden = new Core.NetWarden();
-            return netWarden;
+            netWarden.Start();
         }
         catch (NotSupportedException)
         {
             Application.Run(new SelectDeviceVew());
-            var netWarden = new Core.NetWarden();
-            return netWarden;
+            netWarden.Restart();
         }
     }