Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into chapters

This commit is contained in:
daniel oeh 2012-09-22 10:55:57 +02:00
parent 48292609f6 952c6aa331
commit 7bbbeb0382
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/de/danoeh/antennapod/util/PlaybackController.java
View File

@ -150,7 +150,8 @@ public abstract class PlaybackController {
if (AppConfig.DEBUG) if (AppConfig.DEBUG)
Log.d(TAG, Log.d(TAG,
"PlaybackService is running, trying to connect without start command."); "PlaybackService is running, trying to connect without start command.");
bound = activity.bindService(new Intent(activity, PlaybackService.class), mConnection, 0); bound = activity.bindService(new Intent(activity,
PlaybackService.class), mConnection, 0);
} }
if (AppConfig.DEBUG) if (AppConfig.DEBUG)
Log.d(TAG, "Result for service binding: " + bound); Log.d(TAG, "Result for service binding: " + bound);
@ -406,6 +407,8 @@ public abstract class PlaybackController {
setupGUI(); setupGUI();
handleStatus(); handleStatus();
// make sure that new media is loaded if it's available
mediaInfoLoaded = false;
} else { } else {
Log.e(TAG, Log.e(TAG,