From e408422b36414babde087f2b7aecf429cd39d89d Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 9 Mar 2023 21:57:30 +0100 Subject: [PATCH] Ignore return code 3010 from vcredist package. --- .../packages/io.nymea.nymeaapp/meta/installscript.qs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/windows/packages/io.nymea.nymeaapp/meta/installscript.qs b/packaging/windows/packages/io.nymea.nymeaapp/meta/installscript.qs index 5d26a087..fa2444aa 100644 --- a/packaging/windows/packages/io.nymea.nymeaapp/meta/installscript.qs +++ b/packaging/windows/packages/io.nymea.nymeaapp/meta/installscript.qs @@ -13,8 +13,10 @@ changeLicenseLabels = function() Component.prototype.createOperations = function() { component.createOperations(); - // Ignoring return code 1638, which means a newer version of the redist is already installed - component.addOperation("Execute", "{0,1638}", "@TargetDir@/vc_redist.x64.exe", "/quiet", "/norestart"); + // Ignoring return codes: + // 1638: A newer version of the redist is already installed. Given the other application may remove the redist package upon uninstall, let's not bother and still use our own. + // 3010: The system requires a restart. May be triggered if the machine already had a reboot pending before starting us. + component.addOperation("Execute", "{0,1638,3010}", "@TargetDir@/vc_redist.x64.exe", "/quiet", "/norestart"); if (systemInfo.productType === "windows") { component.addOperation("CreateShortcut", "@TargetDir@/nymea-app.exe", "@StartMenuDir@/nymea app.lnk", "workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico",