From 349ca3c47610c040e4ed7be6748811b29eb78e05 Mon Sep 17 00:00:00 2001
From: cdozdil <cdozdil@gmail.com>
Date: Fri, 3 Oct 2025 01:56:23 +0300
Subject: [PATCH] Fix ResizeBuffer skip check condition

---
 OptiScaler/hooks/FG_Hooks.cpp | 18 +++++++++++-------
 OptiScaler/hooks/FG_Hooks.h   |  2 ++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/OptiScaler/hooks/FG_Hooks.cpp b/OptiScaler/hooks/FG_Hooks.cpp
index 350573b2..c302db7b 100644
--- a/OptiScaler/hooks/FG_Hooks.cpp
+++ b/OptiScaler/hooks/FG_Hooks.cpp
@@ -324,13 +324,14 @@ HRESULT FGHooks::hkResizeBuffers(IDXGISwapChain* This, UINT BufferCount, UINT Wi
     if (_skipResize)
     {
         LOG_DEBUG("XeFG call skipping");
+        _skipResize = false;
         return o_FGSCResizeBuffers(This, BufferCount, Width, Height, NewFormat, SwapChainFlags);
     }
 
     LOG_DEBUG("BufferCount: {}, Width: {}, Height: {}, NewFormat:{}, SwapChainFlags: {}", BufferCount, Width, Height,
               (UINT) NewFormat, SwapChainFlags);
 
-    if (Config::Instance()->OverrideVsync.value_or_default() && !State::Instance().SCExclusiveFullscreen)
+    if (State::Instance().activeFgOutput == FGOutput::XeFG && !State::Instance().SCExclusiveFullscreen)
     {
         DXGI_SWAP_CHAIN_DESC desc {};
         if (This->GetDesc(&desc) == S_OK)
@@ -364,13 +365,13 @@ HRESULT FGHooks::hkResizeBuffers(IDXGISwapChain* This, UINT BufferCount, UINT Wi
         fg->Deactivate();
     }
 
-    _skipResize = true;
+    _skipResize1 = true;
     State::Instance().skipSpoofing = true;
 
     auto result = o_FGSCResizeBuffers(This, BufferCount, Width, Height, NewFormat, SwapChainFlags);
 
     State::Instance().skipSpoofing = false;
-    _skipResize = false;
+    _skipResize1 = false;
 
     LOG_DEBUG("Result: {:X}, Caller: {}", (UINT) result, Util::WhoIsTheCaller(_ReturnAddress()));
 
@@ -427,9 +428,10 @@ HRESULT FGHooks::hkResizeBuffers1(IDXGISwapChain* This, UINT BufferCount, UINT W
                                   UINT SwapChainFlags, const UINT* pCreationNodeMask, IUnknown* const* ppPresentQueue)
 {
     // Skip XeFG's internal call
-    if (_skipResize)
+    if (_skipResize1)
     {
         LOG_DEBUG("XeFG call skipping");
+        _skipResize1 = false;
         return o_FGSCResizeBuffers1(This, BufferCount, Width, Height, Format, SwapChainFlags, pCreationNodeMask,
                                     ppPresentQueue);
     }
@@ -518,14 +520,15 @@ HRESULT FGHooks::hkFGPresent(void* This, UINT SyncInterval, UINT Flags)
     if (_skipPresent)
     {
         LOG_DEBUG("XeFG call skipping");
+        _skipPresent = false;
         return o_FGSCPresent(This, SyncInterval, Flags);
     }
 
     LOG_DEBUG("SyncInterval: {}, Flags: {:X}", SyncInterval, Flags);
 
-    _skipPresent = true;
+    _skipPresent1 = true;
     auto result = FGPresent(This, SyncInterval, Flags, nullptr);
-    _skipPresent = false;
+    _skipPresent1 = false;
 
     return result;
 }
@@ -534,9 +537,10 @@ HRESULT FGHooks::hkFGPresent1(void* This, UINT SyncInterval, UINT Flags,
                               const DXGI_PRESENT_PARAMETERS* pPresentParameters)
 {
     // Skip XeFG's internal call
-    if (_skipPresent)
+    if (_skipPresent1)
     {
         LOG_DEBUG("XeFG call skipping");
+        _skipPresent1 = false;
         return o_FGSCPresent1(This, SyncInterval, Flags, pPresentParameters);
     }
 
diff --git a/OptiScaler/hooks/FG_Hooks.h b/OptiScaler/hooks/FG_Hooks.h
index 1388e5cb..cf46e4d7 100644
--- a/OptiScaler/hooks/FG_Hooks.h
+++ b/OptiScaler/hooks/FG_Hooks.h
@@ -39,7 +39,9 @@ class FGHooks
     inline static PFN_Present1 o_FGSCPresent1 = nullptr;
     inline static HWND _hwnd = nullptr;
     inline static bool _skipResize = false;
+    inline static bool _skipResize1 = false;
     inline static bool _skipPresent = false;
+    inline static bool _skipPresent1 = false;
     inline static UINT _lastSwapChainFlags = 0;
     inline static UINT _lastPresentFlags = 0;
     inline static double _lastFGFrameTime = 0.0;