diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-26 09:32:58 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-26 09:32:58 -0300 |
| commit | 22efa202f5a96de446734dd92a6386916b789619 (patch) | |
| tree | d30b81b674b71d7c626e5b4d706c6702b3f84001 /android/src | |
| parent | f1025df95af44b807e2991168e4608f204f80966 (diff) | |
| parent | c0e91cb1af33188885e999871edc06ae2b6fb034 (diff) | |
| download | mullvadvpn-22efa202f5a96de446734dd92a6386916b789619.tar.xz mullvadvpn-22efa202f5a96de446734dd92a6386916b789619.zip | |
Merge branch 'fix-daemon-startup-race-condition'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 17 |
1 files changed, 10 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 00a486b065..be49d3723c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -174,6 +174,7 @@ class MullvadVpnService : TalpidVpnService() { state = State.Stopped notificationManager.onDestroy() daemonInstance.onDestroy() + instance = null super.onDestroy() } @@ -235,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() { |