summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-25 17:55:49 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-26 11:54:29 +0000
commitc0e91cb1af33188885e999871edc06ae2b6fb034 (patch)
treed30b81b674b71d7c626e5b4d706c6702b3f84001 /android/src
parent0d3cd97f644b087752f658405e3d77c6b21ab485 (diff)
downloadmullvadvpn-c0e91cb1af33188885e999871edc06ae2b6fb034.tar.xz
mullvadvpn-c0e91cb1af33188885e999871edc06ae2b6fb034.zip
Don't overwrite `instance` if not running
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt16
1 files changed, 9 insertions, 7 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 1cf6779a38..be49d3723c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -236,13 +236,15 @@ class MullvadVpnService : TalpidVpnService() {
handlePendingAction(connectionProxy, settings)
- instance = ServiceInstance(
- daemon,
- connectionProxy,
- connectivityListener,
- settingsListener,
- splitTunneling
- )
+ if (state == State.Running) {
+ instance = ServiceInstance(
+ daemon,
+ connectionProxy,
+ connectivityListener,
+ settingsListener,
+ splitTunneling
+ )
+ }
}
private fun stop() {