X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/11c1ad8f78b5453a5a4e7c93014eeaddcf453087..1493579a2e098d77d18eaaa12bf149a0a9a95179:/src/com/owncloud/android/media/MediaServiceBinder.java

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