Fixing a few bugs

1. The images were missing from the about page
2. The Stop button shutdown the WS server, but left exisiting connections open
3. All interfaces were listed even in loopback only mode

Author: blackspherefollower

Buttplug.Apps.WebsocketServerGUI/WebsocketServerControl.xaml.cs

@@ -102,13 +102,17 @@ public void StartServer()
                 _connUrls.Clear();
                 _connUrls.Add(new ConnUrlData(_secure, "localhost", _port));
 
-                foreach (var network in NetworkInterface.GetAllNetworkInterfaces())
+                if (!_loopback)
                 {
-                    foreach (IPAddressInformation address in network.GetIPProperties().UnicastAddresses)
+                    foreach (var network in NetworkInterface.GetAllNetworkInterfaces())
                     {
-                        if (address.Address.AddressFamily == AddressFamily.InterNetwork && !IPAddress.IsLoopback(address.Address))
+                        foreach (IPAddressInformation address in network.GetIPProperties().UnicastAddresses)
                         {
-                            _connUrls.Add(new ConnUrlData(_secure, address.Address.ToString(), _port));
+                            if (address.Address.AddressFamily == AddressFamily.InterNetwork &&
+                                !IPAddress.IsLoopback(address.Address))
+                            {
+                                _connUrls.Add(new ConnUrlData(_secure, address.Address.ToString(), _port));
+                            }
                         }
                     }
                 }

Buttplug.Components.Controls/ButtplugAboutControl.xaml

@@ -6,9 +6,8 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="525">
         <Grid Background="#FFE5E5E5">
-            <Image Name="IconImage" Source="pack://application:,,,/ButtplugControlLibrary;component/Resources/buttplug-logo-1.png" HorizontalAlignment="Left" Height="128" Margin="10,10,0,0" VerticalAlignment="Top" Width="128" MouseDown="IconImage_Click">
-            </Image>
-            <TextBlock HorizontalAlignment="Left" Margin="143,10,0,0" VerticalAlignment="Top" Height="128" Width="360">
+		<Image Name="IconImage" Source="pack://application:,,,/Buttplug.Components.Controls;component/Resources/buttplug-logo-1.png" HorizontalAlignment="Left" Height="128" Margin="10,10,0,0" VerticalAlignment="Top" Width="128" MouseDown="IconImage_Click"/>
+		<TextBlock HorizontalAlignment="Left" Margin="143,10,0,0" VerticalAlignment="Top" Height="128" Width="360">
                 <Span FontSize="19" FontWeight="Bold">Buttplug <Run Name="AboutVersionNumber">1.0.0.0-ffffffff</Run> (C# Edition)</Span><LineBreak />
                 By <Hyperlink NavigateUri="https://metafetish.com" RequestNavigate="Hyperlink_RequestNavigate">Metafetish</Hyperlink><LineBreak />
                 <LineBreak/>
@@ -22,6 +21,6 @@
                 If you would like to help sponsor further development of this and other adult toy and interface software, 
                 please consider donating to our patreon campaign at <Hyperlink NavigateUri="https://patreon.com/qdot" RequestNavigate="Hyperlink_RequestNavigate">http://patreon.com/qdot</Hyperlink>, or by clicking on the Patreon image below. Thanks, and enjoy buttpluging!
             </TextBlock>
-            <Image Source="pack://application:,,,/ButtplugControlLibrary;component/Resources/buttplugin-with-qdot-intro-patreon-image.png"  HorizontalAlignment="Center" VerticalAlignment="Bottom" Width="116" Height="65" Margin="0,10,0,10" MouseDown="PatreonRequestNavigate" />
+			<Image Source="pack://application:,,,/Buttplug.Components.Controls;component/Resources/buttplugin-with-qdot-intro-patreon-image.png"  HorizontalAlignment="Center" VerticalAlignment="Bottom" Width="116" Height="65" Margin="0,10,0,10" MouseDown="PatreonRequestNavigate" />
         </Grid>
 </UserControl>

Buttplug.Components.WebsocketServer/ButtplugWebsocketServer.cs

@@ -41,9 +41,12 @@ public class ButtplugWebsocketServer
         [NotNull]
         private ConcurrentDictionary<string, WebSocket> _connections = new ConcurrentDictionary<string, WebSocket>();
 
+        [NotNull]
+        private CancellationTokenSource _cancellation;
+
         public void StartServer([NotNull] IButtplugServerFactory aFactory, int aPort = 12345, bool aLoopBack = true, bool aSecure = false, string aHostname = "localhost")
         {
-            CancellationTokenSource cancellation = new CancellationTokenSource();
+            _cancellation = new CancellationTokenSource();
             _factory = aFactory;
 
             _logManager = new ButtplugLogManager();
@@ -61,7 +64,7 @@ public void StartServer([NotNull] IButtplugServerFactory aFactory, int aPort = 1
 
             _server.Start();
 
-            Task.Run(() => AcceptWebSocketClientsAsync(_server, cancellation.Token));
+            Task.Run(() => AcceptWebSocketClientsAsync(_server, _cancellation.Token));
         }
 
         private async Task AcceptWebSocketClientsAsync(WebSocketListener aServer, CancellationToken aToken)
@@ -191,6 +194,7 @@ private async Task HandleConnectionAsync(WebSocket ws, CancellationToken cancell
         public void StopServer()
         {
             _server?.Stop();
+            _cancellation.Cancel();
         }
 
         public void Disconnect(string remoteId = null)