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

Merge branch 'dev' into lang

Browse source
This commit is contained in:
Christian Schabesberger 2018-10-07 13:25:35 +02:00 committed by GitHub
commit 38e4249182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -230,7 +230,8 @@ public abstract class BasePlayer implements
int sizeBeforeAppend = playQueue.size(); int sizeBeforeAppend = playQueue.size();
playQueue.append(queue.getStreams()); playQueue.append(queue.getStreams());
if (intent.getBooleanExtra(SELECT_ON_APPEND, false) && if ((intent.getBooleanExtra(SELECT_ON_APPEND, false) ||
getCurrentState() == STATE_COMPLETED) &&
queue.getStreams().size() > 0) { queue.getStreams().size() > 0) {
playQueue.setIndex(sizeBeforeAppend); playQueue.setIndex(sizeBeforeAppend);
} }

2
app/src/main/res/values/strings.xml
View file

@ -34,7 +34,7 @@
<string name="tab_main">Main</string> <string name="tab_main">Main</string>
<string name="tab_subscriptions">Subscriptions</string> <string name="tab_subscriptions">Subscriptions</string>
<string name="tab_bookmarks">Bookmarks</string> <string name="tab_bookmarks">Bookmarked Playlists</string>
<string name="tab_new">New Tab</string> <string name="tab_new">New Tab</string>
<string name="tab_choose">Choose Tab</string> <string name="tab_choose">Choose Tab</string>