address merge conflict

This commit is contained in:
Konstantin Seiler 2020-03-10 23:53:58 +11:00
parent 667e559340
commit d4d55254b0

View file

@ -1103,7 +1103,7 @@ impl PlayerInternal {
position_ms: u32, position_ms: u32,
) { ) {
if !self.config.gapless { if !self.config.gapless {
self.ensure_sink_stopped(); self.ensure_sink_stopped(play);
} }
// emit the correct player event // emit the correct player event
match self.state { match self.state {