fix: Server GUI should disable, not disappear, on server stop

qdot · qdot · commit d666682b95f8 · 2018-05-21T22:48:51.000-07:00
Fixes #418
diff --git a/Buttplug.Apps.ServerGUI/ServerControl.xaml.cs b/Buttplug.Apps.ServerGUI/ServerControl.xaml.cs
@@ -202,7 +202,7 @@ public void StartServer()
 
                 ConnStatus.Content = "(Not Connected)";
                 DisconnectButton.IsEnabled = false;
-                ConnInfo.Visibility = Visibility.Visible;
+                ConnInfo.IsEnabled = true;
             }
             catch (SocketException e)
             {
@@ -216,12 +216,12 @@ public void StartServer()
 
         public void StopServer()
         {
-            _ws.StopServer();
+            _ws?.StopServer();
             ConnToggleButton.Content = "Start";
             SecureCheckBox.IsEnabled = true;
             PortTextBox.IsEnabled = true;
             LoopbackCheckBox.IsEnabled = true;
-            ConnInfo.Visibility = Visibility.Collapsed;
+            ConnInfo.IsEnabled = false;
         }
 
         private void ConnToggleButton_Click(object aObj, RoutedEventArgs aEvent)

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public void StartServer()`
`202`	`202`
`203`	`203`	`ConnStatus.Content = "(Not Connected)";`
`204`	`204`	`DisconnectButton.IsEnabled = false;`
`205`		`- ConnInfo.Visibility = Visibility.Visible;`
	`205`	`+ ConnInfo.IsEnabled = true;`
`206`	`206`	`}`
`207`	`207`	`catch (SocketException e)`
`208`	`208`	`{`
`@@ -216,12 +216,12 @@ public void StartServer()`
`216`	`216`
`217`	`217`	`public void StopServer()`
`218`	`218`	`{`
`219`		`- _ws.StopServer();`
	`219`	`+ _ws?.StopServer();`
`220`	`220`	`ConnToggleButton.Content = "Start";`
`221`	`221`	`SecureCheckBox.IsEnabled = true;`
`222`	`222`	`PortTextBox.IsEnabled = true;`
`223`	`223`	`LoopbackCheckBox.IsEnabled = true;`
`224`		`- ConnInfo.Visibility = Visibility.Collapsed;`
	`224`	`+ ConnInfo.IsEnabled = false;`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`private void ConnToggleButton_Click(object aObj, RoutedEventArgs aEvent)`