baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

-Fixed player new share intent causing main player crash due to player activity in background.

Browse source
This commit is contained in:
John Zhen Mo 2018-06-26 10:21:43 -07:00
parent 4fbd1182c2
commit ef16145695
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
View file

@ -1147,11 +1147,11 @@ public abstract class BasePlayer implements
@Player.RepeatMode @Player.RepeatMode
public int getRepeatMode() { public int getRepeatMode() {
return simpleExoPlayer.getRepeatMode(); return simpleExoPlayer == null ? Player.REPEAT_MODE_OFF : simpleExoPlayer.getRepeatMode();
} }
public void setRepeatMode(@Player.RepeatMode final int repeatMode) { public void setRepeatMode(@Player.RepeatMode final int repeatMode) {
simpleExoPlayer.setRepeatMode(repeatMode); if (simpleExoPlayer != null) simpleExoPlayer.setRepeatMode(repeatMode);
} }
public float getPlaybackSpeed() { public float getPlaybackSpeed() {

5
app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
View file

@ -153,7 +153,10 @@ public final class MainVideoPlayer extends AppCompatActivity
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]"); if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");
super.onNewIntent(intent); super.onNewIntent(intent);
playerImpl.handleIntent(intent); if (intent != null) {
playerState = null;
playerImpl.handleIntent(intent);
}
} }
@Override @Override