diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-02-20 15:47:39 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-02-20 17:07:52 +0100 |
| commit | 2273b5ae56a0954fcec4ad4fe7835f4ea9aeaa10 (patch) | |
| tree | 3dfa451e3e4bc1e5dbaa4f4c08de8cc526c40359 | |
| parent | c0a47fa66622f5617ba49fb19c6c5e0d5d545443 (diff) | |
| download | mullvadvpn-2273b5ae56a0954fcec4ad4fe7835f4ea9aeaa10.tar.xz mullvadvpn-2273b5ae56a0954fcec4ad4fe7835f4ea9aeaa10.zip | |
Improve installer error messages on Windows
| -rw-r--r-- | dist-assets/windows/installer.nsh | 24 | ||||
| -rw-r--r-- | windows/driverlogic/src/driverlogic.cpp | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index d67de6963c..83dd72a6d4 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -132,8 +132,8 @@ Pop $1 ${If} $0 == ${DL_GENERAL_ERROR} - StrCpy $R0 "Failed to remove vanilla TAP adapter: $1" - log::Log $R0 + StrCpy $R0 "Failed to remove vanilla TAP adapter" + log::LogWithDetails $R0 $1 Goto RemoveVanillaTap_return ${EndIf} @@ -194,7 +194,7 @@ Pop $1 ${If} $0 != ${DL_GENERAL_SUCCESS} - StrCpy $R0 "Failed to create virtual adapter: error $0" + StrCpy $R0 "Failed to create virtual adapter" log::LogWithDetails $R0 $1 Goto InstallTapDriver_return ${EndIf} @@ -229,8 +229,8 @@ Pop $1 ${If} $0 != ${MULLVAD_SUCCESS} - StrCpy $R0 "Failed to remove Wintun: error $0" - log::LogWithDetails $R0 $1 + StrCpy $R0 "Failed to remove Wintun: $1" + log::Log $R0 Goto RemoveWintun_return_only ${EndIf} @@ -267,8 +267,8 @@ Pop $1 ${If} $0 != ${MULLVAD_SUCCESS} - StrCpy $R0 "Failed to install Wintun: error $0" - log::LogWithDetails $R0 $1 + StrCpy $R0 "Failed to install Wintun: $1" + log::Log $R0 Goto InstallWintun_return ${EndIf} @@ -314,7 +314,7 @@ Pop $1 ${If} $0 != 0 - StrCpy $R0 "Failed to install Mullvad service: error $0" + StrCpy $R0 "Failed to install Mullvad service" log::LogWithDetails $R0 $1 # @@ -524,7 +524,7 @@ Pop $1 ${If} $0 != ${MULLVAD_SUCCESS} - log::Log "AddCLIToEnvironPath() failed: $0 $1" + log::LogWithDetails "Failed to add the CLI tools to the system PATH" $1 Goto UpdatePath_return ${EndIf} @@ -557,7 +557,7 @@ Pop $1 ${If} $0 != ${MULLVAD_SUCCESS} - log::Log "RemoveCLIFromEnvironPath() failed: $0 $1" + log::LogWithDetails "Failed to remove the CLI tools from the system PATH" $1 Goto RemovePath_return ${EndIf} @@ -655,7 +655,7 @@ ${InstallWintun} ${If} $R0 != 0 - MessageBox MB_OK "Fatal error during Wintun installation: $R0" + MessageBox MB_OK "$R0" ${BreakInstallation} Abort ${EndIf} @@ -663,7 +663,7 @@ ${InstallService} ${If} $R0 != 0 - MessageBox MB_OK "Fatal error during service installation: $R0" + MessageBox MB_OK "$R0" ${BreakInstallation} Abort ${EndIf} diff --git a/windows/driverlogic/src/driverlogic.cpp b/windows/driverlogic/src/driverlogic.cpp index 41c782f0aa..c92ad51ed6 100644 --- a/windows/driverlogic/src/driverlogic.cpp +++ b/windows/driverlogic/src/driverlogic.cpp @@ -686,7 +686,7 @@ void DeleteVanillaMullvadAdapter() if (!deletedAdapter) { - THROW_ERROR("TAP adapter was not removed"); + THROW_ERROR("The TAP adapter could not be removed"); } } |