diff --git a/LaunchServerLib/VAMLaunchServer.cs b/LaunchServerLib/VAMLaunchServer.cs index 625f067..faad148 100644 --- a/LaunchServerLib/VAMLaunchServer.cs +++ b/LaunchServerLib/VAMLaunchServer.cs @@ -70,8 +70,6 @@ public void UpdateThread() _running = true; Console.WriteLine("SERVER IS ON"); - Console.WriteLine("Your Launch device is ready to go when your device shows a solid blue light."); - Console.WriteLine("Note: You can type the command \"lc\" to attempt to re-establish communication."); _timeOfLastLaunchUpdate = DateTime.Now; diff --git a/VaMLaunchGUI/IntifaceControl.xaml.cs b/VaMLaunchGUI/IntifaceControl.xaml.cs index 85b27c5..2874440 100644 --- a/VaMLaunchGUI/IntifaceControl.xaml.cs +++ b/VaMLaunchGUI/IntifaceControl.xaml.cs @@ -120,7 +120,7 @@ public async Task ConnectTask(string aAddress) _client = client; - await Dispatcher.Invoke(async () => + Dispatcher.Invoke(() => { ConnectedHandler?.Invoke(this, new EventArgs()); _connectStatus.Text = $"Connected{(aAddress == null ? ", restart VaMSync to disconnect." : " to Remote Buttplug Server")}"; diff --git a/VaMLaunchGUI/LogControl.xaml.cs b/VaMLaunchGUI/LogControl.xaml.cs index 7e1f307..53fce02 100644 --- a/VaMLaunchGUI/LogControl.xaml.cs +++ b/VaMLaunchGUI/LogControl.xaml.cs @@ -88,7 +88,7 @@ public LogControl() //LogLevelComboBox.SelectionChanged += LogLevelSelectionChangedHandler; LogListBox.ItemsSource = _logs; - ButtplugFFILog.StartLogHandler(ButtplugLogLevel.Info, false); + ButtplugFFILog.SetLogOptions(ButtplugLogLevel.Info, false); Buttplug.ButtplugFFILog.LogMessage += (obj, msg) => _logs.Add(msg.Trim()); } diff --git a/VaMLaunchGUI/VaMLaunchGUI.csproj b/VaMLaunchGUI/VaMLaunchGUI.csproj index 2da1bf2..874b065 100644 --- a/VaMLaunchGUI/VaMLaunchGUI.csproj +++ b/VaMLaunchGUI/VaMLaunchGUI.csproj @@ -39,11 +39,11 @@ false - - ..\packages\Buttplug.1.0.15\lib\netstandard2.0\Buttplug.dll + + ..\packages\Buttplug.2.0.2\lib\net47\Buttplug.dll - - ..\packages\Google.Protobuf.3.14.0\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.17.0\lib\net45\Google.Protobuf.dll ..\packages\MaterialDesignColors.2.0.0\lib\net452\MaterialDesignColors.dll @@ -51,11 +51,11 @@ ..\packages\MaterialDesignThemes.4.0.0\lib\net452\MaterialDesignThemes.Wpf.dll - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.7\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll ..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll @@ -186,7 +186,9 @@ + + \ No newline at end of file diff --git a/VaMLaunchGUI/packages.config b/VaMLaunchGUI/packages.config index a458daf..6224a00 100644 --- a/VaMLaunchGUI/packages.config +++ b/VaMLaunchGUI/packages.config @@ -1,13 +1,13 @@  - - - + + + - - + +