summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaniel oeh <daniel.oeh@gmail.com>2012-06-27 14:40:34 +0200
committerdaniel oeh <daniel.oeh@gmail.com>2012-06-27 14:40:34 +0200
commit2ba8847610e5a30ddadc00e21c624578bb8b1d4d (patch)
treec3d2471234a659b9dce3e6002269156d48eaca46
parent853556b0cfd636bf551c43beba1d516ab503e772 (diff)
downloadAntennaPod-2ba8847610e5a30ddadc00e21c624578bb8b1d4d.zip
Fixed: application crash when trying to play media that is already
playing
-rw-r--r--src/de/podfetcher/feed/FeedManager.java1
-rw-r--r--src/de/podfetcher/service/PlaybackService.java9
2 files changed, 7 insertions, 3 deletions
diff --git a/src/de/podfetcher/feed/FeedManager.java b/src/de/podfetcher/feed/FeedManager.java
index e0089ae0e..c9d57e6e3 100644
--- a/src/de/podfetcher/feed/FeedManager.java
+++ b/src/de/podfetcher/feed/FeedManager.java
@@ -360,6 +360,7 @@ public class FeedManager {
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();
long result = adapter.setMedia(media);
+ adapter.close();
return result;
}
diff --git a/src/de/podfetcher/service/PlaybackService.java b/src/de/podfetcher/service/PlaybackService.java
index 0665b830e..026ada192 100644
--- a/src/de/podfetcher/service/PlaybackService.java
+++ b/src/de/podfetcher/service/PlaybackService.java
@@ -171,8 +171,11 @@ public class PlaybackService extends Service {
stopSelf();
}
- } else if (media != null && status != PlayerStatus.PLAYING) {
- play();
+ } else if (media != null) {
+ if (status == PlayerStatus.PAUSED) {
+ play();
+ }
+
} else {
Log.w(TAG, "Something went wrong. Shutting down...");
stopSelf();
@@ -424,7 +427,7 @@ public class PlaybackService extends Service {
public boolean isPlayingVideo() {
return playingVideo;
}
-
+
public boolean isShouldStream() {
return shouldStream;
}