aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/src/github
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-03-20 18:08:08 -0700
committerScott Jackson <daneren2005@gmail.com>2013-03-20 18:08:08 -0700
commita0c87a2136db0d06c9f49f02c1b36a9c07b68645 (patch)
tree54c94a8e8972d9da274660978b911767b2dcd623 /subsonic-android/src/github
parentb2b9c095cc4742a13eb24b82db4f82de86b9fa30 (diff)
downloaddsub-a0c87a2136db0d06c9f49f02c1b36a9c07b68645.tar.gz
dsub-a0c87a2136db0d06c9f49f02c1b36a9c07b68645.tar.bz2
dsub-a0c87a2136db0d06c9f49f02c1b36a9c07b68645.zip
Stopping shouldn't restart song at the beginning
Diffstat (limited to 'subsonic-android/src/github')
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java2
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
index f487b6e6..d43f13b2 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -788,7 +788,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
private void start() {
DownloadService service = getDownloadService();
PlayerState state = service.getPlayerState();
- if (state == PAUSED || state == COMPLETED) {
+ if (state == PAUSED || state == COMPLETED || state == STOPPED) {
service.start();
} else if (state == STOPPED || state == IDLE) {
warnIfNetworkOrStorageUnavailable();
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index a88b44c3..20e19f56 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -630,7 +630,7 @@ public class DownloadServiceImpl extends Service implements DownloadService {
/** Plays or resumes the playback, depending on the current player state. */
public synchronized void togglePlayPause() {
- if (playerState == PAUSED || playerState == COMPLETED) {
+ if (playerState == PAUSED || playerState == COMPLETED || playerState == STOPPED) {
start();
} else if (playerState == STOPPED || playerState == IDLE) {
play();