From d4d55254b035db3a9374835fbe420d5a2340a2e6 Mon Sep 17 00:00:00 2001
From: Konstantin Seiler <list@kseiler.de>
Date: Tue, 10 Mar 2020 23:53:58 +1100
Subject: [PATCH] address merge conflict

---
 playback/src/player.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playback/src/player.rs b/playback/src/player.rs
index 30faadc6..f685fd71 100644
--- a/playback/src/player.rs
+++ b/playback/src/player.rs
@@ -1103,7 +1103,7 @@ impl PlayerInternal {
         position_ms: u32,
     ) {
         if !self.config.gapless {
-            self.ensure_sink_stopped();
+            self.ensure_sink_stopped(play);
         }
         // emit the correct player event
         match self.state {