1 files changed, 9 insertions, 1 deletions
diff --git a/app/src/main/java/no/topi/fiken/display/MainActivity.java b/app/src/main/java/no/topi/fiken/display/MainActivity.java
index d9dc073..6c21afe 100644
--- a/app/src/main/java/no/topi/fiken/display/MainActivity.java
+++ b/app/src/main/java/no/topi/fiken/display/MainActivity.java
@@ -48,6 +48,8 @@ public class MainActivity extends ListActivity {
     private DisplayService displayService;
     private String deviceToShow;
 
+    private ServiceConnection serviceConnection;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.i(TAG, "onCreate");
@@ -78,7 +80,7 @@ public class MainActivity extends ListActivity {
             finish();
         }
 
-        ServiceConnection serviceConnection = new ServiceConnection() {
+        serviceConnection = new ServiceConnection() {
 
             @Override
             public void onServiceConnected(ComponentName componentName, IBinder service) {
@@ -102,6 +104,11 @@ public class MainActivity extends ListActivity {
     }
 
     @Override
+    protected void onDestroy() {
+        unbindService(serviceConnection);
+    }
+
+    @Override
     protected void onResume() {
         Log.i(TAG, "onResume");
 
@@ -123,6 +130,7 @@ public class MainActivity extends ListActivity {
 
         super.onPause();
         stopScan();
+        unregisterReceiver(displayServiceBroadcastReceiver);
     }
 
     @Override