diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-21 15:28:02 +0000 |
|---|---|---|
| committer | Aleksandr Granin <aleksandr@mullvad.net> | 2021-04-08 13:26:19 +0200 |
| commit | 65be6de695768007bafab2b8afb77e1603a94fd2 (patch) | |
| tree | e22c5b9f9a6de45e5eb514cae9a3cdee1ea60469 | |
| parent | 5cfd3a7bb5c9503da5f3d55726212085d4a28e79 (diff) | |
| download | mullvadvpn-65be6de695768007bafab2b8afb77e1603a94fd2.tar.xz mullvadvpn-65be6de695768007bafab2b8afb77e1603a94fd2.zip | |
Fix race when starting then stopping the daemon
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 14 |
1 files changed, 8 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 5ffeb31f84..cd35ecd9c1 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -216,13 +216,15 @@ class MullvadVpnService : TalpidVpnService() { } } - private fun setUpDaemon(daemon: MullvadDaemon) = GlobalScope.launch(Dispatchers.Default) { - val settings = daemon.getSettings() + private fun setUpDaemon(daemon: MullvadDaemon) = GlobalScope.launch(Dispatchers.Main) { + if (state != State.Stopped) { + val settings = daemon.getSettings() - if (settings != null) { - setUpInstance(daemon, settings) - } else { - restart() + if (settings != null) { + setUpInstance(daemon, settings) + } else { + restart() + } } } |