summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt12
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")
}
}