From e16cc56bf5ca07fd26618b187277373fdb061a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= <detegr@rbx.email>
Date: Mon, 29 Jul 2024 11:01:01 +0300
Subject: [PATCH] bugfix: btb-stage detection for quad-views

---
 CHANGELOG.md   | 5 +++++
 CMakeLists.txt | 2 +-
 src/RBR.cpp    | 4 +---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8cc42f..eed70d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.1
+
+- Fix a bug where a BTB stage was not detected correctly for disabling quad
+  view rendering.
+
 ## 0.9.0
 
 - Change the OpenXR backend to use D3D11 mode. This mode is more compatible
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc5e8ae..69de41f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(HEADERS
 
 set(openRBRVR_Major 0)
 set(openRBRVR_Minor 9)
-set(openRBRVR_Patch 0)
+set(openRBRVR_Patch 1)
 set(openRBRVR_Tweak 0)
 # set(openRBRVR_TweakStr "-rc${openRBRVR_Tweak}")
 
diff --git a/src/RBR.cpp b/src/RBR.cpp
index 9ba19eb..49b4e97 100644
--- a/src/RBR.cpp
+++ b/src/RBR.cpp
@@ -301,9 +301,7 @@ namespace rbr {
                 g::previously_on_btb_stage = false;
                 g::cfg.quad_view_rendering = true;
                 restart_session = true;
-            }
-
-            if (g::vr) {
+            } else if (!g::previously_on_btb_stage && !is_on_btb_stage()) {
                 bool wanted_quad_view_mode = g::vr->get_current_render_context()->quad_view_rendering;
                 restart_session = g::cfg.quad_view_rendering != wanted_quad_view_mode;
                 g::cfg.quad_view_rendering = wanted_quad_view_mode;