From 76a03e99b68ea691029cf7eef20a55e3cb1837ad Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 16 Aug 2023 00:18:16 -0400
Subject: [PATCH] bootmanager: Remove old path

Causes issues with different selected aspect ratios in graphics.
---
 src/yuzu/bootmanager.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index e522845a34..2a9f423a06 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -918,7 +918,6 @@ void GRenderWindow::ReleaseRenderTarget() {
 
 void GRenderWindow::CaptureScreenshot(const QString& screenshot_path) {
     auto& renderer = system.Renderer();
-    const f32 res_scale = Settings::values.resolution_info.up_factor;
 
     if (renderer.IsScreenshotPending()) {
         LOG_WARNING(Render,
@@ -926,15 +925,11 @@ void GRenderWindow::CaptureScreenshot(const QString& screenshot_path) {
         return;
     }
 
-    const Layout::FramebufferLayout layout{[res_scale]() {
-        if (UISettings::values.screenshot_height.GetValue() == 0 &&
-            UISettings::values.screenshot_aspect_ratio.GetValue() ==
-                Settings::ScreenshotAspectRatio::Auto) {
-            return Layout::FrameLayoutFromResolutionScale(res_scale);
-        }
+    const Layout::FramebufferLayout layout{[]() {
         u32 height = UISettings::values.screenshot_height.GetValue();
         if (height == 0) {
-            height = Settings::values.use_docked_mode.GetValue() ? 1080 : 720;
+            height = Settings::values.use_docked_mode.GetValue() ? Layout::ScreenDocked::Height
+                                                                 : Layout::ScreenUndocked::Height;
             height *= Settings::values.resolution_info.up_factor;
         }
         const u32 width = UISettings::CalculateWidth(