Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-06-30 22:29:34 +02:00
commit 7940fcf360

View file

@ -301,7 +301,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
protected void abandonAudioFocus() { protected void abandonAudioFocus() {
log.debug("abandonAudioFocus"); log.debug("abandonAudioFocus");
if (ctx.getSettings().INTERRUPT_MUSIC.get()) { if (ctx.getSettings().INTERRUPT_MUSIC.get() || (btScoStatus == true)) {
stopBtSco(ctx); stopBtSco(ctx);
} }
if (mAudioFocusHelper != null) { if (mAudioFocusHelper != null) {