Ver Fonte

UI: Fix installer/updater check for vs2019 32bit

VS2019 32bit redist does not have/use vcruntime140_1.dll, so remove
those checks from the installer and auto-updater.
jp9000 há 5 anos atrás
pai
commit
580eecda01
2 ficheiros alterados com 3 adições e 2 exclusões
  1. 0 1
      UI/installer/mp-installer.nsi
  2. 3 1
      UI/win-update/updater/updater.cpp

+ 0 - 1
UI/installer/mp-installer.nsi

@@ -123,7 +123,6 @@ Function PreReqCheck
 	; 32 bit Visual Studio 2019 runtime check
 	ClearErrors
 	GetDLLVersion "vcruntime140.DLL" $R0 $R1
-	GetDLLVersion "vcruntime140_1.DLL" $R0 $R1
 	GetDLLVersion "msvcp140.DLL" $R0 $R1
 	IfErrors vs2019Missing_32 vs2019OK_32
 	vs2019Missing_32:

+ 3 - 1
UI/win-update/updater/updater.cpp

@@ -85,7 +85,9 @@ static inline bool HasVS2019Redist2()
 
 	check_dll_installed(L"msvcp140");
 	check_dll_installed(L"vcruntime140");
-	check_dll_installed(L"vcruntime140_1");
+	if (!is32bit) {
+		check_dll_installed(L"vcruntime140_1");
+	}
 
 #undef check_dll_installed