X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/04f5cf170f3b55ba81c2b53d60dc77f7452b9b7a..cf348fc6d9a66e0b84bd48e4ab456c81a3f11028:/src/com/owncloud/android/ui/activity/FileActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index ca9d8d30..28f78750 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -160,18 +160,19 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp
     @Override 
     protected void onStop() {
         super.onStop();
-        if (mOperationsServiceBinder != null) {
-            mOperationsServiceBinder.removeOperationListener(this);
-            mOperationsServiceBinder = null;
-        }
     }
     
     
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (mOperationsServiceConnection != null)
+        if (mOperationsServiceConnection != null) {
+            if (mOperationsServiceBinder != null) {
+                mOperationsServiceBinder.removeOperationListener(this);
+                mOperationsServiceBinder = null;
+            }
             unbindService(mOperationsServiceConnection);
+        }
     }