release media session before shutting down media player

avoids potential unwanted callbacks

1 files changed, 3 insertions, 3 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 6371e6d26..851d865fa 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -283,6 +283,9 @@ public class PlaybackService extends Service implements SharedPreferences.OnShar
 
         PreferenceManager.getDefaultSharedPreferences(this)
                 .unregisterOnSharedPreferenceChangeListener(this);
+        if (mediaSession != null) {
+            mediaSession.release();
+        }
         unregisterReceiver(headsetDisconnected);
         unregisterReceiver(shutdownReceiver);
         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
@@ -294,9 +297,6 @@ public class PlaybackService extends Service implements SharedPreferences.OnShar
         unregisterReceiver(pauseResumeCurrentEpisodeReceiver);
         mediaPlayer.shutdown();
         taskManager.shutdown();
-        if (mediaSession != null) {
-            mediaSession.release();
-        }
     }
 
     @Override