X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ba6eafccb81f6761ae90c2e1f53833a02b119a2e..7101a04247be24d9eb3c1aa49b88ec2496c7d2d6:/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);
         }