1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: Fix installer/updater check for vs2019 32bit

Browse Source 
VS2019 32bit redist does not have/use vcruntime140_1.dll, so remove
those checks from the installer and auto-updater.
This commit is contained in:
jp9000 2020-12-13 21:58:16 -08:00
parent 7368a2c7cc
commit 580eecda01
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/installer/mp-installer.nsi
View File

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

4
UI/win-update/updater/updater.cpp
View File

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