diff --git a/OptiScaler/dllmain.cpp b/OptiScaler/dllmain.cpp index ee761eeb..91bb2bfe 100644 --- a/OptiScaler/dllmain.cpp +++ b/OptiScaler/dllmain.cpp @@ -1143,11 +1143,11 @@ static bool IsRunningOnWine() { LOG_FUNC(); - HMODULE ntdll = GetModuleHandle(L"dxgi.dll"); + HMODULE ntdll = GetModuleHandle(L"ntdll.dll"); if (!ntdll) { - LOG_WARN("IsRunningOnWine Not running on NT!?!"); + LOG_WARN("Not running on NT!?!"); return true; } @@ -1155,11 +1155,11 @@ static bool IsRunningOnWine() if (pWineGetVersion) { - LOG_INFO("IsRunningOnWine Running on Wine {0}!", pWineGetVersion()); + LOG_INFO("Running on Wine {0}!", pWineGetVersion()); return true; } - LOG_WARN("IsRunningOnWine Wine not detected"); + LOG_WARN("Wine not detected"); return false; } diff --git a/OptiScaler/dllmain.h b/OptiScaler/dllmain.h index 6f38a909..67c333e8 100644 --- a/OptiScaler/dllmain.h +++ b/OptiScaler/dllmain.h @@ -1331,12 +1331,13 @@ struct dxgi_dll bool SkipSpoofing() { - auto result = !Config::Instance()->DxgiSpoofing.value_or(true) || Config::Instance()->dxgiSkipSpoofing; + auto result = !Config::Instance()->DxgiSpoofing.value_or(true) || Config::Instance()->dxgiSkipSpoofing || !Config::Instance()->IsRunningOnLinux; if (result) - LOG_TRACE("dxgiSkipSpoofing true, skipping spoofing"); + LOG_TRACE("DxgiSpoofing: {}, dxgiSkipSpoofing: {}, IsRunningOnLinux: {}, skipping spoofing", + !Config::Instance()->DxgiSpoofing.value_or(true), Config::Instance()->dxgiSkipSpoofing, !Config::Instance()->IsRunningOnLinux); - if (!result && Config::Instance()->DxgiBlacklist.has_value() && !Config::Instance()->IsRunningOnLinux) + if (!result && Config::Instance()->DxgiBlacklist.has_value()) { result = true; diff --git a/OptiScaler/resource.h b/OptiScaler/resource.h index 46216ea1..30c896af 100644 --- a/OptiScaler/resource.h +++ b/OptiScaler/resource.h @@ -21,7 +21,7 @@ #define VER_MAJOR_VERSION 0 #define VER_MINOR_VERSION 6 #define VER_HOTFIX_VERSION 7 -#define VER_BUILD_NUMBER 11 +#define VER_BUILD_NUMBER 12 #define VER_PRE_RELEASE