From 50b923cf08c72ea9872c6e5bf9c9cd672aeeb6b5 Mon Sep 17 00:00:00 2001 From: Miniontoby Date: Tue, 4 Feb 2025 22:40:47 +0100 Subject: [PATCH 1/2] Fixed windows audio player and new crashlog dutch translation --- VoiceCraft.Client/VoiceCraft.Client/Locales/nl-nl.json | 1 + .../VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/VoiceCraft.Client/VoiceCraft.Client/Locales/nl-nl.json b/VoiceCraft.Client/VoiceCraft.Client/Locales/nl-nl.json index ea0042d3..e8edbad5 100644 --- a/VoiceCraft.Client/VoiceCraft.Client/Locales/nl-nl.json +++ b/VoiceCraft.Client/VoiceCraft.Client/Locales/nl-nl.json @@ -3,6 +3,7 @@ "Home.Credits": "Credits", "Home.Servers": "Servers", "Home.Settings": "Instellingen", + "Home.CrashLogs": "Crashlogboeken", "AddServer.AddServer": "Server Toevoegen", "AddServer.IP": "IP", diff --git a/VoiceCraft.Client/VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs b/VoiceCraft.Client/VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs index bc96c49f..beaf55e9 100644 --- a/VoiceCraft.Client/VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs +++ b/VoiceCraft.Client/VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs @@ -144,6 +144,7 @@ private void TestPlayer() { if (_player != null) { + _player.Stop(); _player.Dispose(); } else From 804bebb87afd82d414c42529c04089fbc678b8a7 Mon Sep 17 00:00:00 2001 From: Miniontoby Date: Tue, 4 Feb 2025 23:27:48 +0100 Subject: [PATCH 2/2] Updated the code to stop at Dispose --- .../VoiceCraft.Client.Windows/Audio/AudioPlayer.cs | 3 +++ .../VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/VoiceCraft.Client/VoiceCraft.Client.Windows/Audio/AudioPlayer.cs b/VoiceCraft.Client/VoiceCraft.Client.Windows/Audio/AudioPlayer.cs index 72e54c4f..0d235124 100644 --- a/VoiceCraft.Client/VoiceCraft.Client.Windows/Audio/AudioPlayer.cs +++ b/VoiceCraft.Client/VoiceCraft.Client.Windows/Audio/AudioPlayer.cs @@ -102,6 +102,9 @@ private void Dispose(bool disposing) { if (!disposing || _disposed) return; + if (PlaybackState != PlaybackState.Stopped) + Stop(); + _nativePlayer.PlaybackStopped -= InvokePlaybackStopped; _nativePlayer.Dispose(); _disposed = true; diff --git a/VoiceCraft.Client/VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs b/VoiceCraft.Client/VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs index beaf55e9..bc96c49f 100644 --- a/VoiceCraft.Client/VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs +++ b/VoiceCraft.Client/VoiceCraft.Client/ViewModels/Home/SettingsViewModel.cs @@ -144,7 +144,6 @@ private void TestPlayer() { if (_player != null) { - _player.Stop(); _player.Dispose(); } else