diff options
| author | David Lönnhager <david.l@mullvad.net> | 2019-11-25 14:02:00 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2019-11-26 11:41:42 +0100 |
| commit | 9780a487f6abf8aa127cc63c37f89541e978a49f (patch) | |
| tree | e77e8b84827163b280eb13166d05c659c6421f5a | |
| parent | 81c4801cb8c42b7a61ca1893fb559faa56a0d7d7 (diff) | |
| download | mullvadvpn-9780a487f6abf8aa127cc63c37f89541e978a49f.tar.xz mullvadvpn-9780a487f6abf8aa127cc63c37f89541e978a49f.zip | |
Fix error handling in installer
| -rw-r--r-- | dist-assets/windows/installer.nsh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index c68a1f6f26..3f5d175947 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -262,15 +262,15 @@ Pop $0 Pop $1 + Push $0 + Pop $InstallDriver_BaselineStatus + ${If} $0 == ${EB_GENERAL_ERROR} StrCpy $R0 "Failed to enumerate network adapters: $1" log::Log $R0 Goto InstallDriver_return ${EndIf} - Push $0 - Pop $InstallDriver_BaselineStatus - ${IfNot} ${AtLeastWin10} # # Silently approve the certificate before installing the driver @@ -300,6 +300,7 @@ Pop $1 ${If} $0 != 0 + ${AndIf} $0 != 1 StrCpy $R0 "Failed to update TAP driver: error $0" log::LogWithDetails $R0 $1 Goto InstallDriver_return @@ -337,6 +338,7 @@ Pop $1 ${If} $0 != 0 + ${AndIf} $0 != 1 StrCpy $R0 "Failed to create virtual adapter: error $0" log::LogWithDetails $R0 $1 Goto InstallDriver_return |