Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-07-19 16:28:50 +02:00
commit c42c8c6d05
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
View file

@ -60,9 +60,9 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
}
if (mediaPlayer != null){
mediaPlayer.stop();
//Test to see if this fixes #1351
mediaPlayer.release();
mediaPlayer = null;
//Nullifying here fixes #1351, but may be overkill. Let's see if static status variables in VoiceRouter do the job as well.
//mediaPlayer.release();
//mediaPlayer = null;
}
if (ctx != null) {
abandonAudioFocus();

2
OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
View file

@ -133,7 +133,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
ttsRequests = 0;
if (mTts != null){
mTts.stop();
//Test to see if this fixes #2810
//Nullifying here may fix #2810, but should be overkill. Let's see if static status variables in VoiceRouter do the job as well.
//mTts = null;
}
if (ctx != null) {