Release PlaybackController when MediaplayerActivity is stopped0.9.6.4

1 files changed, 15 insertions, 6 deletions

diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index ef381739f..a53b4f4fb 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -51,9 +51,8 @@ public abstract class MediaplayerActivity extends SherlockFragmentActivity
 	protected ImageButton butRev;
 	protected ImageButton butFF;
 
-	public MediaplayerActivity() {
-		super();
-		controller = new PlaybackController(this, false) {
+	private PlaybackController newPlaybackController() {
+		return new PlaybackController(this, false) {
 
 			@Override
 			public void setupGUI() {
@@ -130,6 +129,7 @@ public abstract class MediaplayerActivity extends SherlockFragmentActivity
 				finish();
 			}
 		};
+
 	}
 
 	protected void onServiceQueried() {
@@ -185,10 +185,22 @@ public abstract class MediaplayerActivity extends SherlockFragmentActivity
 	protected int orientation;
 
 	@Override
+	protected void onStart() {
+		super.onStart();
+		if (controller != null) {
+			controller.release();
+		}
+		controller = newPlaybackController();
+	}
+
+	@Override
 	protected void onStop() {
 		super.onStop();
 		if (AppConfig.DEBUG)
 			Log.d(TAG, "Activity stopped");
+		if (controller != null) {
+			controller.release();
+		}
 	}
 
 	@Override
@@ -196,9 +208,6 @@ public abstract class MediaplayerActivity extends SherlockFragmentActivity
 		super.onDestroy();
 		if (AppConfig.DEBUG)
 			Log.d(TAG, "Activity destroyed");
-		if (controller != null) {
-			controller.release();
-		}
 	}
 
 	@Override