summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorJavier <dev.git@javispedro.com>2020-02-18 21:35:38 +0100
committerJavier <dev.git@javispedro.com>2020-02-18 21:35:38 +0100
commit1daa08ff23125c0e82a8414dac2f06ee26ea610e (patch)
tree650d7d65c979354e23c73fdbcffe663bd7a3616f /app/src/main
parenta0392637d40f95cff65e8cf6f096d7b25579e931 (diff)
downloadvndroid-master.tar.gz
vndroid-master.zip
don't kill the service when the server is stoppedHEADmaster
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/javispedro/vndroid/ServerService.java1
-rw-r--r--app/src/main/java/com/javispedro/vndroid/SettingsActivity.java1
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;