2 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/com/javispedro/vndroid/ServerService.java b/app/src/main/java/com/javispedro/vndroid/ServerService.java
index f8c8f9b..3ef4dbb 100644
--- a/app/src/main/java/com/javispedro/vndroid/ServerService.java
+++ b/app/src/main/java/com/javispedro/vndroid/ServerService.java
@@ -136,7 +136,6 @@ public class ServerService extends Service {
         cleanupServer();
 
         stopForeground(true);
-        stopSelf();
 
         notifyServerStatusChanged();
     }
diff --git a/app/src/main/java/com/javispedro/vndroid/SettingsActivity.java b/app/src/main/java/com/javispedro/vndroid/SettingsActivity.java
index a5daab7..9c5a767 100644
--- a/app/src/main/java/com/javispedro/vndroid/SettingsActivity.java
+++ b/app/src/main/java/com/javispedro/vndroid/SettingsActivity.java
@@ -190,6 +190,7 @@ public class SettingsActivity extends AppCompatActivity {
         public void close(Activity activity) {
             if (server != null) {
                 server.setServerStatusCallback(null);
+                server = null;
             }
             activity.unbindService(this);
             callback = null;