From 1433e6e01fea4ec8344c4318a337464df2adcc94 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 4 Mar 2019 11:28:29 +0000 Subject: [PATCH] Completely skip VCRT install if it's already installed * We don't really need to update the version, any VC 2015 version would do, and it causes the installer to try to trigger a reboot if the CRT is in use, which is quite likely. --- util/installer/Installer32.wxs | 14 +++++++++++++- util/installer/Installer64.wxs | 30 ++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/util/installer/Installer32.wxs b/util/installer/Installer32.wxs index 107acfc79..8cacf5e26 100644 --- a/util/installer/Installer32.wxs +++ b/util/installer/Installer32.wxs @@ -314,6 +314,14 @@ + + + + @@ -340,7 +348,11 @@ - + + + "0")]]> + + diff --git a/util/installer/Installer64.wxs b/util/installer/Installer64.wxs index a2165c058..05cf0dccf 100644 --- a/util/installer/Installer64.wxs +++ b/util/installer/Installer64.wxs @@ -332,6 +332,24 @@ + + + + + + + + @@ -361,11 +379,19 @@ - + + + "0")]]> + + - + + + "0")]]> + +