summaryrefslogtreecommitdiffhomepage
path: root/windows
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-01-23 14:20:35 +0100
committerDavid Lönnhager <david.l@mullvad.net>2020-01-23 18:39:51 +0100
commit1bc708ad0764cceb5f1bf87c36862df90e4ccfd7 (patch)
tree9206f4f0c884141c35cd68743085e5d978b1a4a3 /windows
parentf090b37b103964969d494bf7e2cae57cff0d16ea (diff)
downloadmullvadvpn-1bc708ad0764cceb5f1bf87c36862df90e4ccfd7.tar.xz
mullvadvpn-1bc708ad0764cceb5f1bf87c36862df90e4ccfd7.zip
Fix error handling in msiutil
Diffstat (limited to 'windows')
-rw-r--r--windows/nsis-plugins/src/msiutil/msiutil.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/windows/nsis-plugins/src/msiutil/msiutil.cpp b/windows/nsis-plugins/src/msiutil/msiutil.cpp
index 4374832505..b4d8f92521 100644
--- a/windows/nsis-plugins/src/msiutil/msiutil.cpp
+++ b/windows/nsis-plugins/src/msiutil/msiutil.cpp
@@ -125,6 +125,7 @@ void __declspec(dllexport) NSISCALL SilentInstall
ss << L"Install failed: " << installResult;
pushstring(ss.str().c_str());
pushint(NsisStatus::GENERAL_ERROR);
+ return;
}
pushstring(L"");
@@ -189,9 +190,10 @@ void __declspec(dllexport) NSISCALL SilentUninstall
if (ERROR_SUCCESS != installResult)
{
std::wstringstream ss;
- ss << L"Install failed: " << installResult;
+ ss << L"Uninstall failed: " << installResult;
pushstring(ss.str().c_str());
pushint(NsisStatus::GENERAL_ERROR);
+ return;
}
pushstring(L"");