Merge branch 'fix-restarting-after-stopping'

1 files changed, 11 insertions, 6 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..00a486b065 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -132,7 +132,6 @@ class MullvadVpnService : TalpidVpnService() {
         }
 
         if (state == State.Stopping && !quitCommand) {
-            state = State.Running
             restart()
         }
 
@@ -151,7 +150,6 @@ class MullvadVpnService : TalpidVpnService() {
         isBound = true
 
         if (state == State.Stopping) {
-            state = State.Running
             restart()
         }
     }
@@ -254,10 +252,17 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     private fun restart() {
-        Log.d(TAG, "Restarting service")
-        daemonInstance.apply {
-            stop()
-            start()
+        if (state != State.Stopped) {
+            Log.d(TAG, "Restarting service")
+
+            state = State.Running
+
+            daemonInstance.apply {
+                stop()
+                start()
+            }
+        } else {
+            Log.d(TAG, "Ignoring restart because onDestroy has executed")
         }
     }