X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/11c1ad8f78b5453a5a4e7c93014eeaddcf453087..ce7f7fa48c5cce2070a8e42ec19d1954a18db090:/src/com/owncloud/android/media/MediaServiceBinder.java?ds=inline

diff --git a/src/com/owncloud/android/media/MediaServiceBinder.java b/src/com/owncloud/android/media/MediaServiceBinder.java
index 39628c7c..40404063 100644
--- a/src/com/owncloud/android/media/MediaServiceBinder.java
+++ b/src/com/owncloud/android/media/MediaServiceBinder.java
@@ -170,12 +170,12 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
     }
 
 
-    public void registerMediaController(MediaController mediaController) {
+    public void registerMediaController(MediaControlView mediaController) {
         mService.setMediaContoller(mediaController);
     }
     
-    public void unregisterMediaController(MediaController mediaController) {
-        if (mService.getMediaController() == mediaController) {
+    public void unregisterMediaController(MediaControlView mediaController) {
+        if (mediaController != null && mediaController == mService.getMediaController()) {
             mService.setMediaContoller(null);
         }