Don't restart after `onDestroy` has been called

1 files changed, 3 insertions, 1 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 c3749c17f4..f9c2c467db 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -41,6 +41,7 @@ class MullvadVpnService : TalpidVpnService() {
     private val binder = LocalBinder()
     private val serviceNotifier = EventNotifier<ServiceInstance?>(null)
 
+    private var hasStopped = false
     private var isStopping = false
     private var shouldStop = false
 
@@ -172,6 +173,7 @@ class MullvadVpnService : TalpidVpnService() {
 
     override fun onDestroy() {
         Log.d(TAG, "Service has stopped")
+        hasStopped = true
         notificationManager.onDestroy()
         daemonInstance.onDestroy()
         super.onDestroy()
@@ -206,7 +208,7 @@ class MullvadVpnService : TalpidVpnService() {
             Log.d(TAG, "Daemon has stopped")
             instance = null
 
-            if (!isStopping) {
+            if (!isStopping && !hasStopped) {
                 restart()
             }
         }