diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-25 15:00:01 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-26 11:23:57 +0000 |
| commit | 9b1cbfddfe43e63539ca2e803fd8b77ac5e2809c (patch) | |
| tree | 37b44e2919362e03428c08201b0c36d0ae2a4958 /android | |
| parent | f99e235ae18e9c71a6381bd10d9d2a1d0bea0f19 (diff) | |
| download | mullvadvpn-9b1cbfddfe43e63539ca2e803fd8b77ac5e2809c.tar.xz mullvadvpn-9b1cbfddfe43e63539ca2e803fd8b77ac5e2809c.zip | |
Don't restart if `onDestroy` has executed
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 12 |
1 files changed, 8 insertions, 4 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 6920a85b4c..0df44d150d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -254,10 +254,14 @@ class MullvadVpnService : TalpidVpnService() { } private fun restart() { - Log.d(TAG, "Restarting service") - daemonInstance.apply { - stop() - start() + if (state != State.Stopped) { + Log.d(TAG, "Restarting service") + daemonInstance.apply { + stop() + start() + } + } else { + Log.d(TAG, "Ignoring restart because onDestroy has executed") } } |