MusicPlayer.Seek does not throw ArgumentOutOfRangeException

geloczi · Jan 9, 2022 · e32d3d1 · e32d3d1
1 parent 7e058e9
commit e32d3d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/SynAudio/MediaPlayer/MusicPlayer.cs b/SynAudio/MediaPlayer/MusicPlayer.cs
@@ -22,6 +22,7 @@ public class MusicPlayer : ViewModelBase, IDisposable
         private bool _disposed;
         private BackgroundThreadWorker _streamWorker;
         private BackgroundAsyncTaskWorker _pollTask;
+        private BackgroundAsyncTaskWorker _pauseCleanupWorker;
         private SongModel _song;
         private BlockingReadStream _songStream;
         private long _songStreamFullLength;
@@ -109,8 +110,6 @@ public void Play()
             }
         }
 
-        BackgroundAsyncTaskWorker _pauseCleanupWorker;
-
         public void Pause()
         {
             lock (_lock)
@@ -282,10 +281,12 @@ private void Seek(TimeSpan position)
             lock (_lock)
             {
                 StopPolling();
+
                 if (_song is null)
                     return;
-                if (position >= Length)
-                    throw new ArgumentOutOfRangeException(nameof(position));
+
+                if (position > Length - TimeSpan.FromSeconds(1))
+                    position = Length > TimeSpan.FromSeconds(1) ? Length - TimeSpan.FromSeconds(1) : TimeSpan.Zero;
 
                 if (PlaybackState == PlaybackStateType.Playing)
                 {
@@ -353,7 +354,7 @@ private void StopPolling()
             }
         }
 
-        public void UpdateCounters()
+        private void UpdateCounters()
         {
             lock (_lock)
             {

diff --git a/SynAudio/SynAudio.csproj b/SynAudio/SynAudio.csproj
@@ -14,7 +14,7 @@
 	<!-- General -->
 	<PropertyGroup>
 		<Product>SynAudio</Product>
-		<Version>0.6.1</Version>
+		<Version>0.6.2</Version>
 		<Description>Stream music from your Synology NAS.</Description>
 		<RepositoryUrl>https://github.com/geloczigeri/synologydotnet-audiostation-wpf</RepositoryUrl>
 		<Authors>Gergő Gelóczi</Authors>