From d6ee57ae83131ebabf8ac3d34490f6c80f9ff22a Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Fri, 6 Oct 2017 01:27:15 -0400 Subject: [PATCH] libobs/util: Fix Windows 10 revision detection Follow-up to 47aa56b (PR #620). Windows 10 revision detection broke in Build 15036 (Creators Update) after Revision 296. This aims to further fix revision detection on Windows 10. --- libobs/util/platform-windows.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libobs/util/platform-windows.c b/libobs/util/platform-windows.c index b636506b2..47b15cf3c 100644 --- a/libobs/util/platform-windows.c +++ b/libobs/util/platform-windows.c @@ -814,7 +814,7 @@ void get_win_ver(struct win_version_info *info) get_dll_ver(L"kernel32", &ver); got_version = true; - if (ver.major == 10 && ver.revis == 0) { + if (ver.major == 10) { HKEY key; DWORD size, win10_revision; LSTATUS status; @@ -829,7 +829,8 @@ void get_win_ver(struct win_version_info *info) status = RegQueryValueExW(key, L"UBR", NULL, NULL, (LPBYTE)&win10_revision, &size); if (status == ERROR_SUCCESS) - ver.revis = (int)win10_revision; + ver.revis = (int)win10_revision > ver.revis ? + (int)win10_revision : ver.revis; RegCloseKey(key); }