aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-08-09 12:07:34 -0700
committerScott Jackson <daneren2005@gmail.com>2014-08-09 12:07:34 -0700
commitc7e889954e657ad503bad5bc554f609a89eb9335 (patch)
tree8dbe4ba66c26d6ba2f504ad50891db5e08f21dd4 /src
parent551bce485642bab24bf57e06b40d1f5e865b6135 (diff)
parent6e5d2b00bf90cd752aca6a41dfc697b058cde3c6 (diff)
downloaddsub-c7e889954e657ad503bad5bc554f609a89eb9335.tar.gz
dsub-c7e889954e657ad503bad5bc554f609a89eb9335.tar.bz2
dsub-c7e889954e657ad503bad5bc554f609a89eb9335.zip
Merge branch 'master' of https://github.com/daneren2005/Subsonic into CacheUpdate
Diffstat (limited to 'src')
-rw-r--r--src/github/daneren2005/dsub/service/DownloadService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/github/daneren2005/dsub/service/DownloadService.java b/src/github/daneren2005/dsub/service/DownloadService.java
index c4837260..5f58e7fa 100644
--- a/src/github/daneren2005/dsub/service/DownloadService.java
+++ b/src/github/daneren2005/dsub/service/DownloadService.java
@@ -1487,13 +1487,13 @@ public class DownloadService extends Service {
// Acquire a temporary wakelock, since when we return from
// this callback the MediaPlayer will release its wakelock
// and allow the device to go to sleep.
- wakeLock.acquire(60000);
+ wakeLock.acquire(30000);
setPlayerStateCompleted();
int pos = cachedPosition;
Log.i(TAG, "Ending position " + pos + " of " + duration);
- if (!isPartial || (downloadFile.isWorkDone() && (Math.abs(duration - pos) < 10000))) {
+ if (!isPartial || (downloadFile.isWorkDone() && (Math.abs(duration - pos) < 10000)) || nextSetup) {
playNext();
// Finished loading, delete when list is cleared