ui: fix crash when closing configure window

This crash happens 100% of the time (on Linux at least), you just need
to open the configure window and click OK.

It seems to happen when the tabs are destroyed and once all the tabs are
destroyed, a final signal is sent with `index == -1`. So `debug_tab_tab`
doesn't exist anymore when this happens, so the crash.

.travis.yml

@@ -1,59 +0,0 @@
-language: cpp
-matrix:
-  include:
-    - os: linux
-      env: NAME="clang-format"
-      sudo: required
-      dist: trusty
-      services: docker
-      install: "./.travis/clang-format/deps.sh"
-      script: "./.travis/clang-format/build.sh"
-    - os: linux
-      env: NAME="linux build"
-      sudo: required
-      dist: trusty
-      services: docker
-      addons:
-        apt:
-          packages:
-            - p7zip-full
-      install: "./.travis/linux/deps.sh"
-      script: "./.travis/linux/build.sh"
-      after_success: "./.travis/linux/upload.sh"
-      cache: ccache
-    - os: osx
-      env: NAME="macos build"
-      sudo: false
-      osx_image: xcode10.2
-      install: "./.travis/macos/deps.sh"
-      script: "./.travis/macos/build.sh"
-      after_success: "./.travis/macos/upload.sh"
-      cache: ccache
-    - os: linux
-      env: NAME="MinGW build"
-      sudo: required
-      dist: trusty
-      services: docker
-      addons:
-        apt:
-          packages:
-            - p7zip-full
-      install: "./.travis/linux-mingw/deps.sh"
-      script: "./.travis/linux-mingw/build.sh"
-      after_success: "./.travis/linux-mingw/upload.sh"
-      cache: ccache
-
-deploy:
-  provider: releases
-  api_key:
-    secure: ElsIAlbvVXBNKsP31nVPysh+mf0GQA4DiL/y5iJeQxKQYR6iRoNo+RfzOBmdswdo0bE/PGeBAlfzCkp15gjhWf6Je0N6dRpczmcmLq6SSQFn1Mpq00xMJB2AgQIlaHs6KFgoUA173EBKbPwgU/NubTFpJFm/Wa+NcSWAHQXKL9KT2M3qKpxNkPl3mKEVsbch4REP+T/46vsa+ikw0VE0kIs6V93LqUQZpI2F0Dhihx8Cxr5iedkE1QsNK+QSX9iItMHbfek9OH980gP7L3lkZltyAA1Pk0c37OAgz2PwczwNKwCT8jg9PMzdcKmWouvLyAkZFuA806ElzwHY3oEd91Zm6+Bk5n24yBKZ9027AZzw38NK2Z2m9Akb8+ar8PdsKU6N5pDutX9qSLayr0oMgJ0s7/xnGBGdL3gfkPCFc50xO/2DxlsOR+zAhPNM9Y76hhGy6A7/40+9uzrJvd4nAuDvIXRzi2Yl2L7mKBE4suMKbFLtk2LlgM0qY5JMVTQ8NliaEtqopfPur2KWFVJUpWDNLtNX8xGqhfwg7cLjIiGmnxSaJBTDuZI6dpEjkWkU0n1xYhGqEqit8DbehYzazozMJ+Vsr8hku7jGlUtlw+U6HG1e19O2y4aGeSwYPROcCNz+BLwmVM8oZE3Roy3qoaa2yiFf+sy6rUHznrhsfEM=
-  file_glob: true
-  file: "artifacts/*"
-  skip_cleanup: true
-  on:
-    tags: true
-
-notifications:
-  webhooks:
-    urls:
-      - https://api.yuzu-emu.org/code/travis/notify

.travis/clang-format/build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash -ex
-
-docker run --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.travis/clang-format/docker.sh

.travis/clang-format/deps.sh

@@ -1,3 +0,0 @@
-#!/bin/sh -ex
-
-docker pull citraemu/build-environments:linux-clang-format

.travis/clang-format/docker.sh

@@ -1,5 +0,0 @@
-#!/bin/bash -ex
-
-# Run clang-format
-cd /yuzu
-./.travis/clang-format/script.sh

.travis/clang-format/script.sh

@@ -1,37 +0,0 @@
-#!/bin/bash -ex
-
-if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis* dist/*.desktop \
-                 dist/*.svg dist/*.xml; then
-    echo Trailing whitespace found, aborting
-    exit 1
-fi
-
-# Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-10.0
-$CLANG_FORMAT --version
-
-if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
-    # Get list of every file modified in this pull request
-    files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' || true)"
-else
-    # Check everything for branch pushes
-    files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
-fi
-
-# Turn off tracing for this because it's too verbose
-set +x
-
-for f in $files_to_lint; do
-    d=$(diff -u "$f" <($CLANG_FORMAT "$f") || true)
-    if ! [ -z "$d" ]; then
-        echo "!!! $f not compliant to coding style, here is the fix:"
-        echo "$d"
-        fail=1
-    fi
-done
-
-set -x
-
-if [ "$fail" = 1 ]; then
-    exit 1
-fi

.travis/common/post-upload.sh

@@ -1,25 +0,0 @@
-#!/bin/bash -ex
-
-# Copy documentation
-cp license.txt "$REV_NAME"
-cp README.md "$REV_NAME"
-
-tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"
-
-# Find out what release we are building
-if [ -z $TRAVIS_TAG ]; then
-    RELEASE_NAME=head
-else
-    RELEASE_NAME=$(echo $TRAVIS_TAG | cut -d- -f1)
-    if [ "$NAME" = "MinGW build" ]; then
-        RELEASE_NAME="${RELEASE_NAME}-mingw"
-    fi
-fi
-
-mv "$REV_NAME" $RELEASE_NAME
-
-7z a "$REV_NAME.7z" $RELEASE_NAME
-
-# move the compiled archive into the artifacts directory to be uploaded by travis releases
-mv "$ARCHIVE_NAME" artifacts/
-mv "$REV_NAME.7z" artifacts/

.travis/common/pre-upload.sh

@@ -1,6 +0,0 @@
-#!/bin/bash -ex
-
-GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
-GITREV="`git show -s --format='%h'`"
-
-mkdir -p artifacts

.travis/common/travis-ci.env

@@ -1,18 +0,0 @@
-# List of environment variables to be shared with Docker containers
-CI
-TRAVIS
-CONTINUOUS_INTEGRATION
-TRAVIS_BRANCH
-TRAVIS_BUILD_ID
-TRAVIS_BUILD_NUMBER
-TRAVIS_COMMIT
-TRAVIS_COMMIT_RANGE
-TRAVIS_EVENT_TYPE
-TRAVIS_JOB_ID
-TRAVIS_JOB_NUMBER
-TRAVIS_REPO_SLUG
-TRAVIS_TAG
-
-# yuzu specific flags
-ENABLE_COMPATIBILITY_REPORTING
-USE_DISCORD_PRESENCE

.travis/linux-mingw/build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash -ex
-mkdir "$HOME/.ccache" || true
-docker run --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.travis/linux-mingw/docker.sh

.travis/linux-mingw/deps.sh

@@ -1,3 +0,0 @@
-#!/bin/sh -ex
-
-docker pull yuzuemu/build-environments:linux-mingw

.travis/linux-mingw/docker.sh

@@ -1,42 +0,0 @@
-#!/bin/bash -ex
-
-cd /yuzu
-# override Travis CI unreasonable ccache size
-echo 'max_size = 3.0G' > "$HOME/.ccache/ccache.conf"
-
-mkdir build && cd build
-cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release
-ninja
-
-# Clean up the dirty hacks
-rm /bin/uname && mv /bin/uname1 /bin/uname
-rm /bin/cmd
-
-ccache -s
-
-echo "Tests skipped"
-#ctest -VV -C Release
-
-echo 'Prepare binaries...'
-cd ..
-mkdir package
-
-QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/'
-find build/ -name "yuzu*.exe" -exec cp {} 'package' \;
-
-# copy Qt plugins
-mkdir package/platforms
-cp "${QT_PLATFORM_DLL_PATH}/qwindows.dll" package/platforms/
-cp -rv "${QT_PLATFORM_DLL_PATH}/../mediaservice/" package/
-cp -rv "${QT_PLATFORM_DLL_PATH}/../imageformats/" package/
-rm -f package/mediaservice/*d.dll
-
-for i in package/*.exe; do
-  # we need to process pdb here, however, cv2pdb
-  # does not work here, so we just simply strip all the debug symbols
-  x86_64-w64-mingw32-strip "${i}"
-done
-
-pip3 install pefile
-python3 .travis/linux-mingw/scan_dll.py package/*.exe "package/"
-python3 .travis/linux-mingw/scan_dll.py package/imageformats/*.dll "package/"

.travis/linux-mingw/scan_dll.py

@@ -1,106 +0,0 @@
-import pefile
-import sys
-import re
-import os
-import queue
-import shutil
-
-# constant definitions
-KNOWN_SYS_DLLS = ['WINMM.DLL', 'MSVCRT.DLL', 'VERSION.DLL', 'MPR.DLL',
-                  'DWMAPI.DLL', 'UXTHEME.DLL', 'DNSAPI.DLL', 'IPHLPAPI.DLL']
-# below is for Ubuntu 18.04 with specified PPA enabled, if you are using
-# other distro or different repositories, change the following accordingly
-DLL_PATH = [
-    '/usr/x86_64-w64-mingw32/bin/',
-    '/usr/x86_64-w64-mingw32/lib/',
-    '/usr/lib/gcc/x86_64-w64-mingw32/7.3-posix/'
-]
-
-missing = []
-
-
-def parse_imports(file_name):
-    results = []
-    pe = pefile.PE(file_name, fast_load=True)
-    pe.parse_data_directories()
-
-    for entry in pe.DIRECTORY_ENTRY_IMPORT:
-        current = entry.dll.decode()
-        current_u = current.upper()  # b/c Windows is often case insensitive
-        # here we filter out system dlls
-        # dll w/ names like *32.dll are likely to be system dlls
-        if current_u.upper() not in KNOWN_SYS_DLLS and not re.match(string=current_u, pattern=r'.*32\.DLL'):
-            results.append(current)
-
-    return results
-
-
-def parse_imports_recursive(file_name, path_list=[]):
-    q = queue.Queue()  # create a FIFO queue
-    # file_name can be a string or a list for the convience
-    if isinstance(file_name, str):
-        q.put(file_name)
-    elif isinstance(file_name, list):
-        for i in file_name:
-            q.put(i)
-    full_list = []
-    while q.qsize():
-        current = q.get_nowait()
-        print('> %s' % current)
-        deps = parse_imports(current)
-        # if this dll does not have any import, ignore it
-        if not deps:
-            continue
-        for dep in deps:
-            # the dependency already included in the list, skip
-            if dep in full_list:
-                continue
-            # find the requested dll in the provided paths
-            full_path = find_dll(dep)
-            if not full_path:
-                missing.append(dep)
-                continue
-            full_list.append(dep)
-            q.put(full_path)
-            path_list.append(full_path)
-    return full_list
-
-
-def find_dll(name):
-    for path in DLL_PATH:
-        for root, _, files in os.walk(path):
-            for f in files:
-                if name.lower() == f.lower():
-                    return os.path.join(root, f)
-
-
-def deploy(name, dst, dry_run=False):
-    dlls_path = []
-    parse_imports_recursive(name, dlls_path)
-    for dll_entry in dlls_path:
-        if not dry_run:
-            shutil.copy(dll_entry, dst)
-        else:
-            print('[Dry-Run] Copy %s to %s' % (dll_entry, dst))
-    print('Deploy completed.')
-    return dlls_path
-
-
-def main():
-    if len(sys.argv) < 3:
-        print('Usage: %s [files to examine ...] [target deploy directory]')
-        return 1
-    to_deploy = sys.argv[1:-1]
-    tgt_dir = sys.argv[-1]
-    if not os.path.isdir(tgt_dir):
-        print('%s is not a directory.' % tgt_dir)
-        return 1
-    print('Scanning dependencies...')
-    deploy(to_deploy, tgt_dir)
-    if missing:
-        print('Following DLLs are not found: %s' % ('\n'.join(missing)))
-    return 0
-
-
-if __name__ == '__main__':
-    main()

.travis/linux-mingw/upload.sh

@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-
-. .travis/common/pre-upload.sh
-
-REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}"
-ARCHIVE_NAME="${REV_NAME}.tar.gz"
-COMPRESSION_FLAGS="-czvf"
-
-mkdir "$REV_NAME"
-# get around the permission issues
-cp -r package/* "$REV_NAME"
-
-. .travis/common/post-upload.sh

.travis/linux/build.sh

@@ -1,4 +0,0 @@
-#!/bin/bash -ex
-
-mkdir -p "$HOME/.ccache"
-docker run -e ENABLE_COMPATIBILITY_REPORTING --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/home/yuzu/.ccache yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.travis/linux/docker.sh

.travis/linux/deps.sh

@@ -1,3 +0,0 @@
-#!/bin/sh -ex
-
-docker pull yuzuemu/build-environments:linux-fresh

.travis/linux/docker.sh

@@ -1,11 +0,0 @@
-#!/bin/bash -ex
-
-cd /yuzu
-
-mkdir build && cd build
-cmake .. -G Ninja -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON
-ninja
-
-ccache -s
-
-ctest -VV -C Release

.travis/linux/upload.sh

@@ -1,14 +0,0 @@
-#!/bin/bash -ex
-
-. .travis/common/pre-upload.sh
-
-REV_NAME="yuzu-linux-${GITDATE}-${GITREV}"
-ARCHIVE_NAME="${REV_NAME}.tar.xz"
-COMPRESSION_FLAGS="-cJvf"
-
-mkdir "$REV_NAME"
-
-cp build/bin/yuzu-cmd "$REV_NAME"
-cp build/bin/yuzu "$REV_NAME"
-
-. .travis/common/post-upload.sh

.travis/macos/build.sh

@@ -1,17 +0,0 @@
-#!/bin/bash -ex
-
-set -o pipefail
-
-export MACOSX_DEPLOYMENT_TARGET=10.14
-export Qt5_DIR=$(brew --prefix)/opt/qt5
-export PATH="/usr/local/opt/ccache/libexec:$PATH"
-
-# TODO: Build using ninja instead of make
-mkdir build && cd build
-cmake --version
-cmake .. -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DUSE_DISCORD_PRESENCE=ON
-make -j4
-
-ccache -s
-
-ctest -VV -C Release

.travis/macos/deps.sh

@@ -1,6 +0,0 @@
-#!/bin/sh -ex
-
-brew update
-brew install p7zip qt5 sdl2 ccache
-brew outdated cmake || brew upgrade cmake
-pip3 install macpack

.travis/macos/upload.sh

@@ -1,28 +0,0 @@
-#!/bin/bash -ex
-
-. .travis/common/pre-upload.sh
-
-REV_NAME="yuzu-osx-${GITDATE}-${GITREV}"
-ARCHIVE_NAME="${REV_NAME}.tar.gz"
-COMPRESSION_FLAGS="-czvf"
-
-mkdir "$REV_NAME"
-
-cp build/bin/yuzu-cmd "$REV_NAME"
-cp -r build/bin/yuzu.app "$REV_NAME"
-
-# move libs into folder for deployment
-macpack "${REV_NAME}/yuzu.app/Contents/MacOS/yuzu" -d "../Frameworks"
-# move qt frameworks into app bundle for deployment
-$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app" -executable="${REV_NAME}/yuzu.app/Contents/MacOS/yuzu"
-
-# move libs into folder for deployment
-macpack "${REV_NAME}/yuzu-cmd" -d "libs"
-
-# Make the launching script executable
-chmod +x ${REV_NAME}/yuzu.app/Contents/MacOS/yuzu
-
-# Verify loader instructions
-find "$REV_NAME" -exec otool -L {} \;
-
-. .travis/common/post-upload.sh

src/common/fs/path_util.cpp

@@ -82,32 +82,35 @@ public:
 
 private:
     PathManagerImpl() {
+        fs::path yuzu_path;
+        fs::path yuzu_path_cache;
+        fs::path yuzu_path_config;
+
 #ifdef _WIN32
-        auto yuzu_path = GetExeDirectory() / PORTABLE_DIR;
+        yuzu_path = GetExeDirectory() / PORTABLE_DIR;
 
         if (!IsDir(yuzu_path)) {
             yuzu_path = GetAppDataRoamingDirectory() / YUZU_DIR;
         }
 
-        GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path);
-        GenerateYuzuPath(YuzuPath::CacheDir, yuzu_path / CACHE_DIR);
-        GenerateYuzuPath(YuzuPath::ConfigDir, yuzu_path / CONFIG_DIR);
+        yuzu_path_cache = yuzu_path / CACHE_DIR;
+        yuzu_path_config = yuzu_path / CONFIG_DIR;
 #else
-        auto yuzu_path = GetCurrentDir() / PORTABLE_DIR;
+        yuzu_path = GetCurrentDir() / PORTABLE_DIR;
 
         if (Exists(yuzu_path) && IsDir(yuzu_path)) {
-            GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path);
-            GenerateYuzuPath(YuzuPath::CacheDir, yuzu_path / CACHE_DIR);
-            GenerateYuzuPath(YuzuPath::ConfigDir, yuzu_path / CONFIG_DIR);
+            yuzu_path_cache = yuzu_path / CACHE_DIR;
+            yuzu_path_config = yuzu_path / CONFIG_DIR;
         } else {
             yuzu_path = GetDataDirectory("XDG_DATA_HOME") / YUZU_DIR;
-
-            GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path);
-            GenerateYuzuPath(YuzuPath::CacheDir, GetDataDirectory("XDG_CACHE_HOME") / YUZU_DIR);
-            GenerateYuzuPath(YuzuPath::ConfigDir, GetDataDirectory("XDG_CONFIG_HOME") / YUZU_DIR);
+            yuzu_path_cache = GetDataDirectory("XDG_CACHE_HOME") / YUZU_DIR;
+            yuzu_path_config = GetDataDirectory("XDG_CONFIG_HOME") / YUZU_DIR;
         }
 #endif
 
+        GenerateYuzuPath(YuzuPath::YuzuDir, yuzu_path);
+        GenerateYuzuPath(YuzuPath::CacheDir, yuzu_path_cache);
+        GenerateYuzuPath(YuzuPath::ConfigDir, yuzu_path_config);
         GenerateYuzuPath(YuzuPath::DumpDir, yuzu_path / DUMP_DIR);
         GenerateYuzuPath(YuzuPath::KeysDir, yuzu_path / KEYS_DIR);
         GenerateYuzuPath(YuzuPath::LoadDir, yuzu_path / LOAD_DIR);

src/input_common/sdl/sdl_impl.cpp

@@ -170,7 +170,8 @@ public:
     float GetAxis(int axis, float range, float offset) const {
         std::lock_guard lock{mutex};
         const float value = static_cast<float>(state.axes.at(axis)) / 32767.0f;
-        return (value + offset) / range;
+        const float offset_scale = (value + offset) > 0.0f ? 1.0f + offset : 1.0f - offset;
+        return (value + offset) / range / offset_scale;
     }
 
     bool RumblePlay(u16 amp_low, u16 amp_high) {
@@ -789,8 +790,8 @@ public:
         const std::string invert_y_value = params.Get("invert_y", "+");
         const bool invert_x = invert_x_value == "-";
         const bool invert_y = invert_y_value == "-";
-        const float offset_x = params.Get("offset_x", 0.0f);
-        const float offset_y = params.Get("offset_y", 0.0f);
+        const float offset_x = std::clamp(params.Get("offset_x", 0.0f), -0.99f, 0.99f);
+        const float offset_y = std::clamp(params.Get("offset_y", 0.0f), -0.99f, 0.99f);
         auto joystick = state.GetSDLJoystickByGUID(guid, port);
 
         // This is necessary so accessing GetAxis with axis_x and axis_y won't crash

src/video_core/command_classes/codecs/h264.cpp

@@ -20,6 +20,8 @@
 
 #include <array>
 #include <bit>
+
+#include "common/settings.h"
 #include "video_core/command_classes/codecs/h264.h"
 #include "video_core/gpu.h"
 #include "video_core/memory_manager.h"
@@ -96,7 +98,10 @@ const std::vector<u8>& H264::ComposeFrameHeader(const NvdecCommon::NvdecRegister
                            (context.h264_parameter_set.frame_mbs_only_flag ? 1 : 2);
 
     // TODO (ameerj): Where do we get this number, it seems to be particular for each stream
-    writer.WriteUe(6); // Max number of reference frames
+    const auto nvdec_decoding = Settings::values.nvdec_emulation.GetValue();
+    const bool uses_gpu_decoding = nvdec_decoding == Settings::NvdecEmulation::GPU;
+    const u32 max_num_ref_frames = uses_gpu_decoding ? 6u : 16u;
+    writer.WriteUe(max_num_ref_frames);
     writer.WriteBit(false);
     writer.WriteUe(context.h264_parameter_set.pic_width_in_mbs - 1);
     writer.WriteUe(pic_height - 1);

src/video_core/command_classes/vic.cpp

@@ -32,7 +32,7 @@ enum class VideoPixelFormat : u64_le {
     RGBA8 = 0x1f,
     BGRA8 = 0x20,
     RGBX8 = 0x23,
-    Yuv420 = 0x44,
+    YUV420 = 0x44,
 };
 } // Anonymous namespace
 
@@ -88,12 +88,10 @@ void Vic::Execute() {
     const u64 surface_width = config.surface_width_minus1 + 1;
     const u64 surface_height = config.surface_height_minus1 + 1;
     if (static_cast<u64>(frame->width) != surface_width ||
-        static_cast<u64>(frame->height) > surface_height) {
+        static_cast<u64>(frame->height) != surface_height) {
         // TODO: Properly support multiple video streams with differing frame dimensions
-        LOG_WARNING(Debug,
-                    "Frame dimensions {}x{} can't be safely decoded into surface dimensions {}x{}",
+        LOG_WARNING(Service_NVDRV, "Frame dimensions {}x{} don't match surface dimensions {}x{}",
                     frame->width, frame->height, surface_width, surface_height);
-        return;
     }
     switch (config.pixel_format) {
     case VideoPixelFormat::RGBA8:
@@ -101,7 +99,7 @@ void Vic::Execute() {
     case VideoPixelFormat::RGBX8:
         WriteRGBFrame(frame, config);
         break;
-    case VideoPixelFormat::Yuv420:
+    case VideoPixelFormat::YUV420:
         WriteYUVFrame(frame, config);
         break;
     default:
@@ -136,21 +134,20 @@ void Vic::WriteRGBFrame(const AVFrame* frame, const VicConfig& config) {
         scaler_height = frame->height;
         converted_frame_buffer.reset();
     }
-    // Get Converted frame
-    const u32 width = static_cast<u32>(frame->width);
-    const u32 height = static_cast<u32>(frame->height);
-    const std::size_t linear_size = width * height * 4;
-
-    // Only allocate frame_buffer once per stream, as the size is not expected to change
     if (!converted_frame_buffer) {
-        converted_frame_buffer = AVMallocPtr{static_cast<u8*>(av_malloc(linear_size)), av_free};
+        const size_t frame_size = frame->width * frame->height * 4;
+        converted_frame_buffer = AVMallocPtr{static_cast<u8*>(av_malloc(frame_size)), av_free};
     }
     const std::array<int, 4> converted_stride{frame->width * 4, frame->height * 4, 0, 0};
     u8* const converted_frame_buf_addr{converted_frame_buffer.get()};
-
     sws_scale(scaler_ctx, frame->data, frame->linesize, 0, frame->height, &converted_frame_buf_addr,
               converted_stride.data());
 
+    // Use the minimum of surface/frame dimensions to avoid buffer overflow.
+    const u32 surface_width = static_cast<u32>(config.surface_width_minus1) + 1;
+    const u32 surface_height = static_cast<u32>(config.surface_height_minus1) + 1;
+    const u32 width = std::min(surface_width, static_cast<u32>(frame->width));
+    const u32 height = std::min(surface_height, static_cast<u32>(frame->height));
     const u32 blk_kind = static_cast<u32>(config.block_linear_kind);
     if (blk_kind != 0) {
         // swizzle pitch linear to block linear
@@ -158,11 +155,12 @@ void Vic::WriteRGBFrame(const AVFrame* frame, const VicConfig& config) {
         const auto size = Texture::CalculateSize(true, 4, width, height, 1, block_height, 0);
         luma_buffer.resize(size);
         Texture::SwizzleSubrect(width, height, width * 4, width, 4, luma_buffer.data(),
-                                converted_frame_buffer.get(), block_height, 0, 0);
+                                converted_frame_buf_addr, block_height, 0, 0);
 
         gpu.MemoryManager().WriteBlock(output_surface_luma_address, luma_buffer.data(), size);
     } else {
         // send pitch linear frame
+        const size_t linear_size = width * height * 4;
         gpu.MemoryManager().WriteBlock(output_surface_luma_address, converted_frame_buf_addr,
                                        linear_size);
     }
@@ -173,9 +171,10 @@ void Vic::WriteYUVFrame(const AVFrame* frame, const VicConfig& config) {
 
     const std::size_t surface_width = config.surface_width_minus1 + 1;
     const std::size_t surface_height = config.surface_height_minus1 + 1;
+    const std::size_t aligned_width = (surface_width + 0xff) & ~0xffUL;
+    // Use the minimum of surface/frame dimensions to avoid buffer overflow.
     const auto frame_width = std::min(surface_width, static_cast<size_t>(frame->width));
     const auto frame_height = std::min(surface_height, static_cast<size_t>(frame->height));
-    const std::size_t aligned_width = (surface_width + 0xff) & ~0xffUL;
 
     const auto stride = static_cast<size_t>(frame->linesize[0]);
 

src/yuzu/applets/qt_controller.cpp

@@ -37,17 +37,14 @@ constexpr std::array<std::array<bool, 4>, 8> led_patterns{{
 }};
 
 void UpdateController(Settings::ControllerType controller_type, std::size_t npad_index,
-                      bool connected) {
-    Core::System& system{Core::System::GetInstance()};
-
+                      bool connected, Core::System& system) {
     if (!system.IsPoweredOn()) {
         return;
     }
 
-    Service::SM::ServiceManager& sm = system.ServiceManager();
-
     auto& npad =
-        sm.GetService<Service::HID::Hid>("hid")
+        system.ServiceManager()
+            .GetService<Service::HID::Hid>("hid")
             ->GetAppletResource()
             ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad);
 
@@ -79,10 +76,10 @@ bool IsControllerCompatible(Settings::ControllerType controller_type,
 
 QtControllerSelectorDialog::QtControllerSelectorDialog(
     QWidget* parent, Core::Frontend::ControllerParameters parameters_,
-    InputCommon::InputSubsystem* input_subsystem_)
+    InputCommon::InputSubsystem* input_subsystem_, Core::System& system_)
     : QDialog(parent), ui(std::make_unique<Ui::QtControllerSelectorDialog>()),
       parameters(std::move(parameters_)), input_subsystem{input_subsystem_},
-      input_profiles(std::make_unique<InputProfiles>()) {
+      input_profiles(std::make_unique<InputProfiles>(system_)), system{system_} {
     ui->setupUi(this);
 
     player_widgets = {
@@ -245,7 +242,7 @@ int QtControllerSelectorDialog::exec() {
 void QtControllerSelectorDialog::ApplyConfiguration() {
     const bool pre_docked_mode = Settings::values.use_docked_mode.GetValue();
     Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked());
-    OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode.GetValue());
+    OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode.GetValue(), system);
 
     Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
     Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
@@ -293,7 +290,7 @@ void QtControllerSelectorDialog::CallConfigureMotionTouchDialog() {
 }
 
 void QtControllerSelectorDialog::CallConfigureInputProfileDialog() {
-    ConfigureInputProfileDialog dialog(this, input_subsystem, input_profiles.get());
+    ConfigureInputProfileDialog dialog(this, input_subsystem, input_profiles.get(), system);
 
     dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
                           Qt::WindowSystemMenuHint);
@@ -533,7 +530,7 @@ void QtControllerSelectorDialog::UpdateControllerState(std::size_t player_index)
     }
 
     // Disconnect the controller first.
-    UpdateController(controller_type, player_index, false);
+    UpdateController(controller_type, player_index, false, system);
 
     player.controller_type = controller_type;
     player.connected = player_connected;
@@ -548,7 +545,7 @@ void QtControllerSelectorDialog::UpdateControllerState(std::size_t player_index)
         }
         handheld.connected = player_groupboxes[player_index]->isChecked() &&
                              controller_type == Settings::ControllerType::Handheld;
-        UpdateController(Settings::ControllerType::Handheld, 8, handheld.connected);
+        UpdateController(Settings::ControllerType::Handheld, 8, handheld.connected, system);
     }
 
     if (!player.connected) {
@@ -560,7 +557,7 @@ void QtControllerSelectorDialog::UpdateControllerState(std::size_t player_index)
     using namespace std::chrono_literals;
     std::this_thread::sleep_for(60ms);
 
-    UpdateController(controller_type, player_index, player_connected);
+    UpdateController(controller_type, player_index, player_connected, system);
 }
 
 void QtControllerSelectorDialog::UpdateLEDPattern(std::size_t player_index) {
@@ -659,7 +656,8 @@ void QtControllerSelectorDialog::DisableUnsupportedPlayers() {
     for (std::size_t index = max_supported_players; index < NUM_PLAYERS; ++index) {
         // Disconnect any unsupported players here and disable or hide them if applicable.
         Settings::values.players.GetValue()[index].connected = false;
-        UpdateController(Settings::values.players.GetValue()[index].controller_type, index, false);
+        UpdateController(Settings::values.players.GetValue()[index].controller_type, index, false,
+                         system);
         // Hide the player widgets when max_supported_controllers is less than or equal to 4.
         if (max_supported_players <= 4) {
             player_widgets[index]->hide();

src/yuzu/applets/qt_controller.h

@@ -7,6 +7,7 @@
 #include <array>
 #include <memory>
 #include <QDialog>
+#include "core/core.h"
 #include "core/frontend/applets/controller.h"
 
 class GMainWindow;
@@ -36,7 +37,8 @@ class QtControllerSelectorDialog final : public QDialog {
 public:
     explicit QtControllerSelectorDialog(QWidget* parent,
                                         Core::Frontend::ControllerParameters parameters_,
-                                        InputCommon::InputSubsystem* input_subsystem_);
+                                        InputCommon::InputSubsystem* input_subsystem_,
+                                        Core::System& system_);
     ~QtControllerSelectorDialog() override;
 
     int exec() override;
@@ -103,6 +105,8 @@ private:
 
     std::unique_ptr<InputProfiles> input_profiles;
 
+    Core::System& system;
+
     // This is true if and only if all parameters are met. Otherwise, this is false.
     // This determines whether the "OK" button can be clicked to exit the applet.
     bool parameters_met{false};

src/yuzu/bootmanager.cpp

@@ -42,7 +42,7 @@
 #include "yuzu/bootmanager.h"
 #include "yuzu/main.h"
 
-EmuThread::EmuThread() = default;
+EmuThread::EmuThread(Core::System& system_) : system{system_} {}
 
 EmuThread::~EmuThread() = default;
 
@@ -51,7 +51,6 @@ void EmuThread::run() {
     MicroProfileOnThreadCreate(name.c_str());
     Common::SetCurrentThreadName(name.c_str());
 
-    auto& system = Core::System::GetInstance();
     auto& gpu = system.GPU();
     auto stop_token = stop_source.get_token();
 
@@ -285,8 +284,10 @@ static Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow*
 }
 
 GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
-                             std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_)
-    : QWidget(parent), emu_thread(emu_thread_), input_subsystem{std::move(input_subsystem_)} {
+                             std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_,
+                             Core::System& system_)
+    : QWidget(parent),
+      emu_thread(emu_thread_), input_subsystem{std::move(input_subsystem_)}, system{system_} {
     setWindowTitle(QStringLiteral("yuzu %1 | %2-%3")
                        .arg(QString::fromUtf8(Common::g_build_name),
                             QString::fromUtf8(Common::g_scm_branch),
@@ -629,8 +630,7 @@ void GRenderWindow::ReleaseRenderTarget() {
 }
 
 void GRenderWindow::CaptureScreenshot(u32 res_scale, const QString& screenshot_path) {
-    auto& renderer = Core::System::GetInstance().Renderer();
-
+    VideoCore::RendererBase& renderer = system.Renderer();
     if (res_scale == 0) {
         res_scale = VideoCore::GetResolutionScaleFactor(renderer);
     }

src/yuzu/bootmanager.h

@@ -34,13 +34,14 @@ enum class MouseButton;
 
 namespace VideoCore {
 enum class LoadCallbackStage;
-}
+class RendererBase;
+} // namespace VideoCore
 
 class EmuThread final : public QThread {
     Q_OBJECT
 
 public:
-    explicit EmuThread();
+    explicit EmuThread(Core::System& system_);
     ~EmuThread() override;
 
     /**
@@ -101,6 +102,7 @@ private:
     std::condition_variable_any running_cv;
     Common::Event running_wait{};
     std::atomic_bool running_guard{false};
+    Core::System& system;
 
 signals:
     /**
@@ -131,7 +133,8 @@ class GRenderWindow : public QWidget, public Core::Frontend::EmuWindow {
 
 public:
     explicit GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
-                           std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_);
+                           std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_,
+                           Core::System& system_);
     ~GRenderWindow() override;
 
     // EmuWindow implementation.
@@ -232,6 +235,8 @@ private:
 
     std::array<std::size_t, 16> touch_ids{};
 
+    Core::System& system;
+
 protected:
     void showEvent(QShowEvent* event) override;
     bool eventFilter(QObject* object, QEvent* event) override;

src/yuzu/compatdb.cpp

@@ -8,14 +8,13 @@
 #include <QtConcurrent/qtconcurrentrun.h>
 #include "common/logging/log.h"
 #include "common/telemetry.h"
-#include "core/core.h"
 #include "core/telemetry_session.h"
 #include "ui_compatdb.h"
 #include "yuzu/compatdb.h"
 
-CompatDB::CompatDB(QWidget* parent)
+CompatDB::CompatDB(Core::TelemetrySession& telemetry_session_, QWidget* parent)
     : QWizard(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),
-      ui{std::make_unique<Ui::CompatDB>()} {
+      ui{std::make_unique<Ui::CompatDB>()}, telemetry_session{telemetry_session_} {
     ui->setupUi(this);
     connect(ui->radioButton_Perfect, &QRadioButton::clicked, this, &CompatDB::EnableNext);
     connect(ui->radioButton_Great, &QRadioButton::clicked, this, &CompatDB::EnableNext);
@@ -53,16 +52,15 @@ void CompatDB::Submit() {
     case CompatDBPage::Final:
         back();
         LOG_DEBUG(Frontend, "Compatibility Rating: {}", compatibility->checkedId());
-        Core::System::GetInstance().TelemetrySession().AddField(
-            Common::Telemetry::FieldType::UserFeedback, "Compatibility",
-            compatibility->checkedId());
+        telemetry_session.AddField(Common::Telemetry::FieldType::UserFeedback, "Compatibility",
+                                   compatibility->checkedId());
 
         button(NextButton)->setEnabled(false);
         button(NextButton)->setText(tr("Submitting"));
         button(CancelButton)->setVisible(false);
 
-        testcase_watcher.setFuture(QtConcurrent::run(
-            [] { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); }));
+        testcase_watcher.setFuture(
+            QtConcurrent::run([this] { return telemetry_session.SubmitTestcase(); }));
         break;
     default:
         LOG_ERROR(Frontend, "Unexpected page: {}", currentId());

src/yuzu/compatdb.h

@@ -7,6 +7,7 @@
 #include <memory>
 #include <QFutureWatcher>
 #include <QWizard>
+#include "core/telemetry_session.h"
 
 namespace Ui {
 class CompatDB;
@@ -16,7 +17,7 @@ class CompatDB : public QWizard {
     Q_OBJECT
 
 public:
-    explicit CompatDB(QWidget* parent = nullptr);
+    explicit CompatDB(Core::TelemetrySession& telemetry_session_, QWidget* parent = nullptr);
     ~CompatDB();
 
 private:
@@ -27,4 +28,6 @@ private:
     void Submit();
     void OnTestcaseSubmitted();
     void EnableNext();
+
+    Core::TelemetrySession& telemetry_session;
 };

src/yuzu/configuration/config.cpp

@@ -16,7 +16,8 @@
 
 namespace FS = Common::FS;
 
-Config::Config(const std::string& config_name, ConfigType config_type) : type(config_type) {
+Config::Config(Core::System& system_, const std::string& config_name, ConfigType config_type)
+    : type(config_type), system{system_} {
     global = config_type == ConfigType::GlobalConfig;
 
     Initialize(config_name);
@@ -1593,7 +1594,7 @@ void Config::Reload() {
     ReadValues();
     // To apply default value changes
     SaveValues();
-    Core::System::GetInstance().ApplySettings();
+    system.ApplySettings();
 }
 
 void Config::Save() {

src/yuzu/configuration/config.h

@@ -14,6 +14,10 @@
 
 class QSettings;
 
+namespace Core {
+class System;
+}
+
 class Config {
 public:
     enum class ConfigType {
@@ -22,7 +26,7 @@ public:
         InputProfile,
     };
 
-    explicit Config(const std::string& config_name = "qt-config",
+    explicit Config(Core::System& system_, const std::string& config_name = "qt-config",
                     ConfigType config_type = ConfigType::GlobalConfig);
     ~Config();
 
@@ -176,6 +180,8 @@ private:
     std::unique_ptr<QSettings> qt_config;
     std::string qt_config_loc;
     bool global;
+
+    Core::System& system;
 };
 
 // These metatype declarations cannot be in common/settings.h because core is devoid of QT

src/yuzu/configuration/configure.ui

@@ -41,120 +41,8 @@
      <item>
       <widget class="QTabWidget" name="tabWidget">
        <property name="currentIndex">
-        <number>11</number>
+        <number>-1</number>
        </property>
-       <widget class="ConfigureGeneral" name="generalTab">
-        <property name="accessibleName">
-         <string>General</string>
-        </property>
-        <attribute name="title">
-         <string>General</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureUi" name="uiTab">
-        <property name="accessibleName">
-         <string>UI</string>
-        </property>
-        <attribute name="title">
-         <string>Game List</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureSystem" name="systemTab">
-        <property name="accessibleName">
-         <string>System</string>
-        </property>
-        <attribute name="title">
-         <string>System</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureProfileManager" name="profileManagerTab">
-        <property name="accessibleName">
-         <string>Profiles</string>
-        </property>
-        <attribute name="title">
-         <string>Profiles</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureFilesystem" name="filesystemTab">
-        <property name="accessibleName">
-         <string>Filesystem</string>
-        </property>
-        <attribute name="title">
-         <string>Filesystem</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureInput" name="inputTab">
-        <property name="accessibleName">
-         <string>Controls</string>
-        </property>
-        <attribute name="title">
-         <string>Controls</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureHotkeys" name="hotkeysTab">
-        <property name="accessibleName">
-         <string>Hotkeys</string>
-        </property>
-        <attribute name="title">
-         <string>Hotkeys</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureCpu" name="cpuTab">
-        <property name="accessibleName">
-         <string>CPU</string>
-        </property>
-        <attribute name="title">
-         <string>CPU</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureGraphics" name="graphicsTab">
-        <property name="accessibleName">
-         <string>Graphics</string>
-        </property>
-        <attribute name="title">
-         <string>Graphics</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureGraphicsAdvanced" name="graphicsAdvancedTab">
-        <property name="accessibleName">
-         <string>Advanced</string>
-        </property>
-        <attribute name="title">
-         <string>GraphicsAdvanced</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureAudio" name="audioTab">
-        <property name="accessibleName">
-         <string>Audio</string>
-        </property>
-        <attribute name="title">
-         <string>Audio</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureDebugTab" name="debugTab">
-        <property name="accessibleName">
-         <string>Debug</string>
-        </property>
-        <attribute name="title">
-         <string>Debug</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureWeb" name="webTab">
-        <property name="accessibleName">
-         <string>Web</string>
-        </property>
-        <attribute name="title">
-         <string>Web</string>
-        </attribute>
-       </widget>
-       <widget class="ConfigureNetwork" name="networkTab">
-        <property name="accessibleName">
-         <string>Network</string>
-        </property>
-        <attribute name="title">
-         <string>Network</string>
-        </attribute>
-       </widget>
       </widget>
      </item>
     </layout>
@@ -168,92 +56,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>ConfigureGeneral</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_general.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureSystem</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_system.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureProfileManager</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_profile_manager.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureFilesystem</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_filesystem.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureAudio</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_audio.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureCpu</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_cpu.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureGraphics</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_graphics.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureGraphicsAdvanced</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_graphics_advanced.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureWeb</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_web.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureUi</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_ui.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureInput</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_input.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureHotkeys</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_hotkeys.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureNetwork</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_network.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureDebugTab</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_debug_tab.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>

src/yuzu/configuration/configure_audio.cpp

@@ -14,8 +14,8 @@
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_audio.h"
 
-ConfigureAudio::ConfigureAudio(QWidget* parent)
-    : QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()) {
+ConfigureAudio::ConfigureAudio(const Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()), system{system_} {
     ui->setupUi(this);
 
     InitializeAudioOutputSinkComboBox();
@@ -32,7 +32,7 @@ ConfigureAudio::ConfigureAudio(QWidget* parent)
 
     SetConfiguration();
 
-    const bool is_powered_on = Core::System::GetInstance().IsPoweredOn();
+    const bool is_powered_on = system_.IsPoweredOn();
     ui->output_sink_combo_box->setEnabled(!is_powered_on);
     ui->audio_device_combo_box->setEnabled(!is_powered_on);
 }

src/yuzu/configuration/configure_audio.h

@@ -7,6 +7,10 @@
 #include <memory>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 namespace ConfigurationShared {
 enum class CheckState;
 }
@@ -19,10 +23,11 @@ class ConfigureAudio : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureAudio(QWidget* parent = nullptr);
+    explicit ConfigureAudio(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureAudio() override;
 
     void ApplyConfiguration();
+    void SetConfiguration();
 
 private:
     void changeEvent(QEvent* event) override;
@@ -33,7 +38,6 @@ private:
 
     void UpdateAudioDevices(int sink_index);
 
-    void SetConfiguration();
     void SetOutputSinkFromSinkID();
     void SetAudioDeviceFromDeviceID();
     void SetVolumeIndicatorText(int percentage);
@@ -41,4 +45,6 @@ private:
     void SetupPerGameUI();
 
     std::unique_ptr<Ui::ConfigureAudio> ui;
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_audio.ui

@@ -10,6 +10,9 @@
     <height>368</height>
    </rect>
   </property>
+  <property name="accessibleName">
+   <string>Audio</string>
+  </property>
   <layout class="QVBoxLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">

src/yuzu/configuration/configure_cpu.cpp

@@ -13,7 +13,8 @@
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_cpu.h"
 
-ConfigureCpu::ConfigureCpu(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureCpu) {
+ConfigureCpu::ConfigureCpu(const Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureCpu), system{system_} {
     ui->setupUi(this);
 
     SetupPerGameUI();
@@ -27,7 +28,7 @@ ConfigureCpu::ConfigureCpu(QWidget* parent) : QWidget(parent), ui(new Ui::Config
 ConfigureCpu::~ConfigureCpu() = default;
 
 void ConfigureCpu::SetConfiguration() {
-    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
+    const bool runtime_lock = !system.IsPoweredOn();
 
     ui->accuracy->setEnabled(runtime_lock);
     ui->cpuopt_unsafe_unfuse_fma->setEnabled(runtime_lock);

src/yuzu/configuration/configure_cpu.h

@@ -8,6 +8,10 @@
 #include <QWidget>
 #include "common/settings.h"
 
+namespace Core {
+class System;
+}
+
 namespace ConfigurationShared {
 enum class CheckState;
 }
@@ -20,10 +24,11 @@ class ConfigureCpu : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureCpu(QWidget* parent = nullptr);
+    explicit ConfigureCpu(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureCpu() override;
 
     void ApplyConfiguration();
+    void SetConfiguration();
 
 private:
     void changeEvent(QEvent* event) override;
@@ -31,8 +36,6 @@ private:
 
     void UpdateGroup(int index);
 
-    void SetConfiguration();
-
     void SetupPerGameUI();
 
     std::unique_ptr<Ui::ConfigureCpu> ui;
@@ -42,4 +45,6 @@ private:
     ConfigurationShared::CheckState cpuopt_unsafe_ignore_standard_fpcr;
     ConfigurationShared::CheckState cpuopt_unsafe_inaccurate_nan;
     ConfigurationShared::CheckState cpuopt_unsafe_fastmem_check;
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_cpu.ui

@@ -7,12 +7,15 @@
     <x>0</x>
     <y>0</y>
     <width>448</width>
-    <height>433</height>
+    <height>439</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>CPU</string>
+  </property>
   <layout class="QVBoxLayout">
    <item>
     <layout class="QVBoxLayout">

src/yuzu/configuration/configure_cpu_debug.cpp

@@ -11,8 +11,8 @@
 #include "ui_configure_cpu_debug.h"
 #include "yuzu/configuration/configure_cpu_debug.h"
 
-ConfigureCpuDebug::ConfigureCpuDebug(QWidget* parent)
-    : QWidget(parent), ui(new Ui::ConfigureCpuDebug) {
+ConfigureCpuDebug::ConfigureCpuDebug(const Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureCpuDebug), system{system_} {
     ui->setupUi(this);
 
     SetConfiguration();
@@ -21,7 +21,7 @@ ConfigureCpuDebug::ConfigureCpuDebug(QWidget* parent)
 ConfigureCpuDebug::~ConfigureCpuDebug() = default;
 
 void ConfigureCpuDebug::SetConfiguration() {
-    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
+    const bool runtime_lock = !system.IsPoweredOn();
 
     ui->cpuopt_page_tables->setEnabled(runtime_lock);
     ui->cpuopt_page_tables->setChecked(Settings::values.cpuopt_page_tables.GetValue());

src/yuzu/configuration/configure_cpu_debug.h

@@ -7,6 +7,10 @@
 #include <memory>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 namespace Ui {
 class ConfigureCpuDebug;
 }
@@ -15,7 +19,7 @@ class ConfigureCpuDebug : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureCpuDebug(QWidget* parent = nullptr);
+    explicit ConfigureCpuDebug(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureCpuDebug() override;
 
     void ApplyConfiguration();
@@ -27,4 +31,6 @@ private:
     void SetConfiguration();
 
     std::unique_ptr<Ui::ConfigureCpuDebug> ui;
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_cpu_debug.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>CPU</string>
+  </property>
   <layout class="QVBoxLayout">
    <item>
     <layout class="QVBoxLayout">

src/yuzu/configuration/configure_debug.cpp

@@ -14,7 +14,8 @@
 #include "yuzu/debugger/console.h"
 #include "yuzu/uisettings.h"
 
-ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureDebug) {
+ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureDebug), system{system_} {
     ui->setupUi(this);
     SetConfiguration();
 
@@ -28,7 +29,7 @@ ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::Co
 ConfigureDebug::~ConfigureDebug() = default;
 
 void ConfigureDebug::SetConfiguration() {
-    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
+    const bool runtime_lock = !system.IsPoweredOn();
 
     ui->toggle_console->setEnabled(runtime_lock);
     ui->toggle_console->setChecked(UISettings::values.show_console.GetValue());

src/yuzu/configuration/configure_debug.h

@@ -7,6 +7,10 @@
 #include <memory>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 namespace Ui {
 class ConfigureDebug;
 }
@@ -15,7 +19,7 @@ class ConfigureDebug : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureDebug(QWidget* parent = nullptr);
+    explicit ConfigureDebug(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureDebug() override;
 
     void ApplyConfiguration();
@@ -27,4 +31,6 @@ private:
     void SetConfiguration();
 
     std::unique_ptr<Ui::ConfigureDebug> ui;
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_debug_controller.cpp

@@ -2,16 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/core.h"
 #include "ui_configure_debug_controller.h"
 #include "yuzu/configuration/configure_debug_controller.h"
 #include "yuzu/configuration/configure_input_player.h"
 
 ConfigureDebugController::ConfigureDebugController(QWidget* parent,
                                                    InputCommon::InputSubsystem* input_subsystem,
-                                                   InputProfiles* profiles)
+                                                   InputProfiles* profiles, Core::System& system)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigureDebugController>()),
       debug_controller(
-          new ConfigureInputPlayer(this, 9, nullptr, input_subsystem, profiles, true)) {
+          new ConfigureInputPlayer(this, 9, nullptr, input_subsystem, profiles, system, true)) {
     ui->setupUi(this);
 
     ui->controllerLayout->addWidget(debug_controller);

src/yuzu/configuration/configure_debug_controller.h

@@ -13,6 +13,10 @@ class ConfigureInputPlayer;
 
 class InputProfiles;
 
+namespace Core {
+class System;
+}
+
 namespace InputCommon {
 class InputSubsystem;
 }
@@ -26,7 +30,7 @@ class ConfigureDebugController : public QDialog {
 
 public:
     explicit ConfigureDebugController(QWidget* parent, InputCommon::InputSubsystem* input_subsystem,
-                                      InputProfiles* profiles);
+                                      InputProfiles* profiles, Core::System& system);
     ~ConfigureDebugController() override;
 
     void ApplyConfiguration();

src/yuzu/configuration/configure_debug_tab.cpp

@@ -2,21 +2,29 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <memory>
 #include "ui_configure_debug_tab.h"
+#include "yuzu/configuration/configure_cpu_debug.h"
+#include "yuzu/configuration/configure_debug.h"
 #include "yuzu/configuration/configure_debug_tab.h"
 
-ConfigureDebugTab::ConfigureDebugTab(QWidget* parent)
-    : QWidget(parent), ui(new Ui::ConfigureDebugTab) {
+ConfigureDebugTab::ConfigureDebugTab(const Core::System& system_, QWidget* parent)
+    : QWidget(parent),
+      ui(new Ui::ConfigureDebugTab), debug_tab{std::make_unique<ConfigureDebug>(system_, this)},
+      cpu_debug_tab{std::make_unique<ConfigureCpuDebug>(system_, this)} {
     ui->setupUi(this);
 
+    ui->tabWidget->addTab(debug_tab.get(), tr("Debug"));
+    ui->tabWidget->addTab(cpu_debug_tab.get(), tr("CPU"));
+
     SetConfiguration();
 }
 
 ConfigureDebugTab::~ConfigureDebugTab() = default;
 
 void ConfigureDebugTab::ApplyConfiguration() {
-    ui->debugTab->ApplyConfiguration();
-    ui->cpuDebugTab->ApplyConfiguration();
+    debug_tab->ApplyConfiguration();
+    cpu_debug_tab->ApplyConfiguration();
 }
 
 void ConfigureDebugTab::SetCurrentIndex(int index) {

src/yuzu/configuration/configure_debug_tab.h

@@ -7,6 +7,13 @@
 #include <memory>
 #include <QWidget>
 
+class ConfigureDebug;
+class ConfigureCpuDebug;
+
+namespace Core {
+class System;
+}
+
 namespace Ui {
 class ConfigureDebugTab;
 }
@@ -15,7 +22,7 @@ class ConfigureDebugTab : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureDebugTab(QWidget* parent = nullptr);
+    explicit ConfigureDebugTab(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureDebugTab() override;
 
     void ApplyConfiguration();
@@ -29,4 +36,7 @@ private:
     void SetConfiguration();
 
     std::unique_ptr<Ui::ConfigureDebugTab> ui;
+
+    std::unique_ptr<ConfigureDebug> debug_tab;
+    std::unique_ptr<ConfigureCpuDebug> cpu_debug_tab;
 };

src/yuzu/configuration/configure_debug_tab.ui

@@ -13,40 +13,19 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>Debug</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>-1</number>
      </property>
-     <widget class="ConfigureDebug" name="debugTab">
-      <attribute name="title">
-       <string>General</string>
-      </attribute>
-     </widget>
-     <widget class="ConfigureCpuDebug" name="cpuDebugTab">
-      <attribute name="title">
-       <string>CPU</string>
-      </attribute>
-     </widget>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>ConfigureDebug</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_debug.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureCpuDebug</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_cpu_debug.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

src/yuzu/configuration/configure_dialog.cpp

@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <memory>
 #include <QAbstractButton>
 #include <QDialogButtonBox>
 #include <QHash>
@@ -9,37 +10,87 @@
 #include <QPushButton>
 #include <QSignalBlocker>
 #include <QTabWidget>
+#include "common/logging/log.h"
 #include "common/settings.h"
 #include "core/core.h"
 #include "ui_configure.h"
 #include "yuzu/configuration/config.h"
+#include "yuzu/configuration/configure_audio.h"
+#include "yuzu/configuration/configure_cpu.h"
+#include "yuzu/configuration/configure_debug_tab.h"
 #include "yuzu/configuration/configure_dialog.h"
+#include "yuzu/configuration/configure_filesystem.h"
+#include "yuzu/configuration/configure_general.h"
+#include "yuzu/configuration/configure_graphics.h"
+#include "yuzu/configuration/configure_graphics_advanced.h"
+#include "yuzu/configuration/configure_hotkeys.h"
+#include "yuzu/configuration/configure_input.h"
 #include "yuzu/configuration/configure_input_player.h"
+#include "yuzu/configuration/configure_network.h"
+#include "yuzu/configuration/configure_profile_manager.h"
+#include "yuzu/configuration/configure_system.h"
+#include "yuzu/configuration/configure_ui.h"
+#include "yuzu/configuration/configure_web.h"
 #include "yuzu/hotkeys.h"
 
 ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry,
-                                 InputCommon::InputSubsystem* input_subsystem)
-    : QDialog(parent), ui(new Ui::ConfigureDialog), registry(registry) {
+                                 InputCommon::InputSubsystem* input_subsystem,
+                                 Core::System& system_)
+    : QDialog(parent), ui(new Ui::ConfigureDialog),
+      registry(registry), system{system_}, audio_tab{std::make_unique<ConfigureAudio>(system_,
+                                                                                      this)},
+      cpu_tab{std::make_unique<ConfigureCpu>(system_, this)},
+      debug_tab_tab{std::make_unique<ConfigureDebugTab>(system_, this)},
+      filesystem_tab{std::make_unique<ConfigureFilesystem>(this)},
+      general_tab{std::make_unique<ConfigureGeneral>(system_, this)},
+      graphics_tab{std::make_unique<ConfigureGraphics>(system_, this)},
+      graphics_advanced_tab{std::make_unique<ConfigureGraphicsAdvanced>(system_, this)},
+      hotkeys_tab{std::make_unique<ConfigureHotkeys>(this)},
+      input_tab{std::make_unique<ConfigureInput>(system_, this)},
+      network_tab{std::make_unique<ConfigureNetwork>(system_, this)},
+      profile_tab{std::make_unique<ConfigureProfileManager>(system_, this)},
+      system_tab{std::make_unique<ConfigureSystem>(system_, this)},
+      ui_tab{std::make_unique<ConfigureUi>(system_, this)}, web_tab{std::make_unique<ConfigureWeb>(
+                                                                this)} {
     Settings::SetConfiguringGlobal(true);
 
     ui->setupUi(this);
-    ui->hotkeysTab->Populate(registry);
+
+    ui->tabWidget->addTab(audio_tab.get(), tr("Audio"));
+    ui->tabWidget->addTab(cpu_tab.get(), tr("CPU"));
+    ui->tabWidget->addTab(debug_tab_tab.get(), tr("Debug"));
+    ui->tabWidget->addTab(filesystem_tab.get(), tr("Filesystem"));
+    ui->tabWidget->addTab(general_tab.get(), tr("General"));
+    ui->tabWidget->addTab(graphics_tab.get(), tr("Graphics"));
+    ui->tabWidget->addTab(graphics_advanced_tab.get(), tr("GraphicsAdvanced"));
+    ui->tabWidget->addTab(hotkeys_tab.get(), tr("Hotkeys"));
+    ui->tabWidget->addTab(input_tab.get(), tr("Controls"));
+    ui->tabWidget->addTab(profile_tab.get(), tr("Profiles"));
+    ui->tabWidget->addTab(network_tab.get(), tr("Network"));
+    ui->tabWidget->addTab(system_tab.get(), tr("System"));
+    ui->tabWidget->addTab(ui_tab.get(), tr("Game List"));
+    ui->tabWidget->addTab(web_tab.get(), tr("Web"));
+
+    hotkeys_tab->Populate(registry);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-    ui->inputTab->Initialize(input_subsystem);
+    input_tab->Initialize(input_subsystem);
 
-    ui->generalTab->SetResetCallback([&] { this->close(); });
+    general_tab->SetResetCallback([&] { this->close(); });
 
     SetConfiguration();
     PopulateSelectionList();
 
-    connect(ui->tabWidget, &QTabWidget::currentChanged, this,
-            [this]() { ui->debugTab->SetCurrentIndex(0); });
-    connect(ui->uiTab, &ConfigureUi::LanguageChanged, this, &ConfigureDialog::OnLanguageChanged);
+    connect(ui->tabWidget, &QTabWidget::currentChanged, this, [this](int index) {
+        if (index != -1) {
+            debug_tab_tab->SetCurrentIndex(0);
+        }
+    });
+    connect(ui_tab.get(), &ConfigureUi::LanguageChanged, this, &ConfigureDialog::OnLanguageChanged);
     connect(ui->selectorList, &QListWidget::itemSelectionChanged, this,
             &ConfigureDialog::UpdateVisibleTabs);
 
-    if (Core::System::GetInstance().IsPoweredOn()) {
+    if (system.IsPoweredOn()) {
         QPushButton* apply_button = ui->buttonBox->addButton(QDialogButtonBox::Apply);
         connect(apply_button, &QAbstractButton::clicked, this,
                 &ConfigureDialog::HandleApplyButtonClicked);
@@ -54,21 +105,21 @@ ConfigureDialog::~ConfigureDialog() = default;
 void ConfigureDialog::SetConfiguration() {}
 
 void ConfigureDialog::ApplyConfiguration() {
-    ui->generalTab->ApplyConfiguration();
-    ui->uiTab->ApplyConfiguration();
-    ui->systemTab->ApplyConfiguration();
-    ui->profileManagerTab->ApplyConfiguration();
-    ui->filesystemTab->applyConfiguration();
-    ui->inputTab->ApplyConfiguration();
-    ui->hotkeysTab->ApplyConfiguration(registry);
-    ui->cpuTab->ApplyConfiguration();
-    ui->graphicsTab->ApplyConfiguration();
-    ui->graphicsAdvancedTab->ApplyConfiguration();
-    ui->audioTab->ApplyConfiguration();
-    ui->debugTab->ApplyConfiguration();
-    ui->webTab->ApplyConfiguration();
-    ui->networkTab->ApplyConfiguration();
-    Core::System::GetInstance().ApplySettings();
+    general_tab->ApplyConfiguration();
+    ui_tab->ApplyConfiguration();
+    system_tab->ApplyConfiguration();
+    profile_tab->ApplyConfiguration();
+    filesystem_tab->applyConfiguration();
+    input_tab->ApplyConfiguration();
+    hotkeys_tab->ApplyConfiguration(registry);
+    cpu_tab->ApplyConfiguration();
+    graphics_tab->ApplyConfiguration();
+    graphics_advanced_tab->ApplyConfiguration();
+    audio_tab->ApplyConfiguration();
+    debug_tab_tab->ApplyConfiguration();
+    web_tab->ApplyConfiguration();
+    network_tab->ApplyConfiguration();
+    system.ApplySettings();
     Settings::LogSettings();
 }
 
@@ -102,12 +153,14 @@ Q_DECLARE_METATYPE(QList<QWidget*>);
 
 void ConfigureDialog::PopulateSelectionList() {
     const std::array<std::pair<QString, QList<QWidget*>>, 6> items{
-        {{tr("General"), {ui->generalTab, ui->hotkeysTab, ui->uiTab, ui->webTab, ui->debugTab}},
-         {tr("System"), {ui->systemTab, ui->profileManagerTab, ui->networkTab, ui->filesystemTab}},
-         {tr("CPU"), {ui->cpuTab}},
-         {tr("Graphics"), {ui->graphicsTab, ui->graphicsAdvancedTab}},
-         {tr("Audio"), {ui->audioTab}},
-         {tr("Controls"), ui->inputTab->GetSubTabs()}},
+        {{tr("General"),
+          {general_tab.get(), hotkeys_tab.get(), ui_tab.get(), web_tab.get(), debug_tab_tab.get()}},
+         {tr("System"),
+          {system_tab.get(), profile_tab.get(), network_tab.get(), filesystem_tab.get()}},
+         {tr("CPU"), {cpu_tab.get()}},
+         {tr("Graphics"), {graphics_tab.get(), graphics_advanced_tab.get()}},
+         {tr("Audio"), {audio_tab.get()}},
+         {tr("Controls"), input_tab->GetSubTabs()}},
     };
 
     [[maybe_unused]] const QSignalBlocker blocker(ui->selectorList);
@@ -142,6 +195,7 @@ void ConfigureDialog::UpdateVisibleTabs() {
     const auto tabs = qvariant_cast<QList<QWidget*>>(items[0]->data(Qt::UserRole));
 
     for (auto* const tab : tabs) {
+        LOG_DEBUG(Frontend, "{}", tab->accessibleName().toStdString());
         ui->tabWidget->addTab(tab, tab->accessibleName());
     }
 }

src/yuzu/configuration/configure_dialog.h

@@ -7,6 +7,25 @@
 #include <memory>
 #include <QDialog>
 
+namespace Core {
+class System;
+}
+
+class ConfigureAudio;
+class ConfigureCpu;
+class ConfigureDebugTab;
+class ConfigureFilesystem;
+class ConfigureGeneral;
+class ConfigureGraphics;
+class ConfigureGraphicsAdvanced;
+class ConfigureHotkeys;
+class ConfigureInput;
+class ConfigureProfileManager;
+class ConfigureSystem;
+class ConfigureNetwork;
+class ConfigureUi;
+class ConfigureWeb;
+
 class HotkeyRegistry;
 
 namespace InputCommon {
@@ -22,7 +41,7 @@ class ConfigureDialog : public QDialog {
 
 public:
     explicit ConfigureDialog(QWidget* parent, HotkeyRegistry& registry,
-                             InputCommon::InputSubsystem* input_subsystem);
+                             InputCommon::InputSubsystem* input_subsystem, Core::System& system_);
     ~ConfigureDialog() override;
 
     void ApplyConfiguration();
@@ -45,4 +64,21 @@ private:
 
     std::unique_ptr<Ui::ConfigureDialog> ui;
     HotkeyRegistry& registry;
+
+    Core::System& system;
+
+    std::unique_ptr<ConfigureAudio> audio_tab;
+    std::unique_ptr<ConfigureCpu> cpu_tab;
+    std::unique_ptr<ConfigureDebugTab> debug_tab_tab;
+    std::unique_ptr<ConfigureFilesystem> filesystem_tab;
+    std::unique_ptr<ConfigureGeneral> general_tab;
+    std::unique_ptr<ConfigureGraphics> graphics_tab;
+    std::unique_ptr<ConfigureGraphicsAdvanced> graphics_advanced_tab;
+    std::unique_ptr<ConfigureHotkeys> hotkeys_tab;
+    std::unique_ptr<ConfigureInput> input_tab;
+    std::unique_ptr<ConfigureNetwork> network_tab;
+    std::unique_ptr<ConfigureProfileManager> profile_tab;
+    std::unique_ptr<ConfigureSystem> system_tab;
+    std::unique_ptr<ConfigureUi> ui_tab;
+    std::unique_ptr<ConfigureWeb> web_tab;
 };

src/yuzu/configuration/configure_filesystem.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>Filesystem</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">

src/yuzu/configuration/configure_general.cpp

@@ -15,8 +15,8 @@
 #include "yuzu/configuration/configure_general.h"
 #include "yuzu/uisettings.h"
 
-ConfigureGeneral::ConfigureGeneral(QWidget* parent)
-    : QWidget(parent), ui(new Ui::ConfigureGeneral) {
+ConfigureGeneral::ConfigureGeneral(const Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureGeneral), system{system_} {
     ui->setupUi(this);
 
     SetupPerGameUI();
@@ -35,7 +35,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
 ConfigureGeneral::~ConfigureGeneral() = default;
 
 void ConfigureGeneral::SetConfiguration() {
-    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
+    const bool runtime_lock = !system.IsPoweredOn();
 
     ui->use_multi_core->setEnabled(runtime_lock);
     ui->use_multi_core->setChecked(Settings::values.use_multi_core.GetValue());

src/yuzu/configuration/configure_general.h

@@ -8,6 +8,10 @@
 #include <memory>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 class ConfigureDialog;
 
 namespace ConfigurationShared {
@@ -24,19 +28,18 @@ class ConfigureGeneral : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureGeneral(QWidget* parent = nullptr);
+    explicit ConfigureGeneral(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureGeneral() override;
 
     void SetResetCallback(std::function<void()> callback);
     void ResetDefaults();
     void ApplyConfiguration();
+    void SetConfiguration();
 
 private:
     void changeEvent(QEvent* event) override;
     void RetranslateUI();
 
-    void SetConfiguration();
-
     void SetupPerGameUI();
 
     std::function<void()> reset_callback;
@@ -45,4 +48,6 @@ private:
 
     ConfigurationShared::CheckState use_speed_limit;
     ConfigurationShared::CheckState use_multi_core;
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_general.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>General</string>
+  </property>
   <layout class="QHBoxLayout" name="HorizontalLayout">
    <item>
     <layout class="QVBoxLayout" name="VerticalLayout">

src/yuzu/configuration/configure_graphics.cpp

@@ -19,8 +19,8 @@
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_graphics.h"
 
-ConfigureGraphics::ConfigureGraphics(QWidget* parent)
-    : QWidget(parent), ui(new Ui::ConfigureGraphics) {
+ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureGraphics), system{system_} {
     vulkan_device = Settings::values.vulkan_device.GetValue();
     RetrieveVulkanDevices();
 
@@ -83,7 +83,7 @@ void ConfigureGraphics::UpdateShaderBackendSelection(int backend) {
 ConfigureGraphics::~ConfigureGraphics() = default;
 
 void ConfigureGraphics::SetConfiguration() {
-    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
+    const bool runtime_lock = !system.IsPoweredOn();
 
     ui->api_widget->setEnabled(runtime_lock);
     ui->use_asynchronous_gpu_emulation->setEnabled(runtime_lock);

src/yuzu/configuration/configure_graphics.h

@@ -10,6 +10,10 @@
 #include <QWidget>
 #include "common/settings.h"
 
+namespace Core {
+class System;
+}
+
 namespace ConfigurationShared {
 enum class CheckState;
 }
@@ -22,17 +26,16 @@ class ConfigureGraphics : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureGraphics(QWidget* parent = nullptr);
+    explicit ConfigureGraphics(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureGraphics() override;
 
     void ApplyConfiguration();
+    void SetConfiguration();
 
 private:
     void changeEvent(QEvent* event) override;
     void RetranslateUI();
 
-    void SetConfiguration();
-
     void UpdateBackgroundColorButton(QColor color);
     void UpdateAPILayout();
     void UpdateDeviceSelection(int device);
@@ -56,4 +59,6 @@ private:
     std::vector<QString> vulkan_devices;
     u32 vulkan_device{};
     Settings::ShaderBackend shader_backend{};
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_graphics.ui

@@ -7,12 +7,15 @@
     <x>0</x>
     <y>0</y>
     <width>437</width>
-    <height>321</height>
+    <height>482</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>Graphics</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_1">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">

src/yuzu/configuration/configure_graphics_advanced.cpp

@@ -8,8 +8,8 @@
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_graphics_advanced.h"
 
-ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(QWidget* parent)
-    : QWidget(parent), ui(new Ui::ConfigureGraphicsAdvanced) {
+ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(const Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureGraphicsAdvanced), system{system_} {
 
     ui->setupUi(this);
 
@@ -21,7 +21,7 @@ ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(QWidget* parent)
 ConfigureGraphicsAdvanced::~ConfigureGraphicsAdvanced() = default;
 
 void ConfigureGraphicsAdvanced::SetConfiguration() {
-    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
+    const bool runtime_lock = !system.IsPoweredOn();
     ui->use_vsync->setEnabled(runtime_lock);
     ui->use_asynchronous_shaders->setEnabled(runtime_lock);
     ui->anisotropic_filtering_combobox->setEnabled(runtime_lock);

src/yuzu/configuration/configure_graphics_advanced.h

@@ -7,6 +7,10 @@
 #include <memory>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 namespace ConfigurationShared {
 enum class CheckState;
 }
@@ -19,17 +23,16 @@ class ConfigureGraphicsAdvanced : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureGraphicsAdvanced(QWidget* parent = nullptr);
+    explicit ConfigureGraphicsAdvanced(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureGraphicsAdvanced() override;
 
     void ApplyConfiguration();
+    void SetConfiguration();
 
 private:
     void changeEvent(QEvent* event) override;
     void RetranslateUI();
 
-    void SetConfiguration();
-
     void SetupPerGameUI();
 
     std::unique_ptr<Ui::ConfigureGraphicsAdvanced> ui;
@@ -37,4 +40,6 @@ private:
     ConfigurationShared::CheckState use_vsync;
     ConfigurationShared::CheckState use_asynchronous_shaders;
     ConfigurationShared::CheckState use_fast_gpu_time;
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_graphics_advanced.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>Advanced</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_1">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">

src/yuzu/configuration/configure_hotkeys.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Hotkey Settings</string>
   </property>
+  <property name="accessibleName">
+   <string>Hotkeys</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">

src/yuzu/configuration/configure_input.cpp

@@ -39,12 +39,11 @@ void CallConfigureDialog(ConfigureInput& parent, Args&&... args) {
 }
 } // Anonymous namespace
 
-void OnDockedModeChanged(bool last_state, bool new_state) {
+void OnDockedModeChanged(bool last_state, bool new_state, Core::System& system) {
     if (last_state == new_state) {
         return;
     }
 
-    Core::System& system{Core::System::GetInstance()};
     if (!system.IsPoweredOn()) {
         return;
     }
@@ -66,9 +65,9 @@ void OnDockedModeChanged(bool last_state, bool new_state) {
     }
 }
 
-ConfigureInput::ConfigureInput(QWidget* parent)
+ConfigureInput::ConfigureInput(Core::System& system_, QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()),
-      profiles(std::make_unique<InputProfiles>()) {
+      profiles(std::make_unique<InputProfiles>(system_)), system{system_} {
     ui->setupUi(this);
 }
 
@@ -77,22 +76,22 @@ ConfigureInput::~ConfigureInput() = default;
 void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem,
                                 std::size_t max_players) {
     player_controllers = {
-        new ConfigureInputPlayer(this, 0, ui->consoleInputSettings, input_subsystem,
-                                 profiles.get()),
-        new ConfigureInputPlayer(this, 1, ui->consoleInputSettings, input_subsystem,
-                                 profiles.get()),
-        new ConfigureInputPlayer(this, 2, ui->consoleInputSettings, input_subsystem,
-                                 profiles.get()),
-        new ConfigureInputPlayer(this, 3, ui->consoleInputSettings, input_subsystem,
-                                 profiles.get()),
-        new ConfigureInputPlayer(this, 4, ui->consoleInputSettings, input_subsystem,
-                                 profiles.get()),
-        new ConfigureInputPlayer(this, 5, ui->consoleInputSettings, input_subsystem,
-                                 profiles.get()),
-        new ConfigureInputPlayer(this, 6, ui->consoleInputSettings, input_subsystem,
-                                 profiles.get()),
-        new ConfigureInputPlayer(this, 7, ui->consoleInputSettings, input_subsystem,
-                                 profiles.get()),
+        new ConfigureInputPlayer(this, 0, ui->consoleInputSettings, input_subsystem, profiles.get(),
+                                 system),
+        new ConfigureInputPlayer(this, 1, ui->consoleInputSettings, input_subsystem, profiles.get(),
+                                 system),
+        new ConfigureInputPlayer(this, 2, ui->consoleInputSettings, input_subsystem, profiles.get(),
+                                 system),
+        new ConfigureInputPlayer(this, 3, ui->consoleInputSettings, input_subsystem, profiles.get(),
+                                 system),
+        new ConfigureInputPlayer(this, 4, ui->consoleInputSettings, input_subsystem, profiles.get(),
+                                 system),
+        new ConfigureInputPlayer(this, 5, ui->consoleInputSettings, input_subsystem, profiles.get(),
+                                 system),
+        new ConfigureInputPlayer(this, 6, ui->consoleInputSettings, input_subsystem, profiles.get(),
+                                 system),
+        new ConfigureInputPlayer(this, 7, ui->consoleInputSettings, input_subsystem, profiles.get(),
+                                 system),
     };
 
     player_tabs = {
@@ -148,7 +147,8 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem,
     ui->tabAdvanced->setLayout(new QHBoxLayout(ui->tabAdvanced));
     ui->tabAdvanced->layout()->addWidget(advanced);
     connect(advanced, &ConfigureInputAdvanced::CallDebugControllerDialog, [this, input_subsystem] {
-        CallConfigureDialog<ConfigureDebugController>(*this, input_subsystem, profiles.get());
+        CallConfigureDialog<ConfigureDebugController>(*this, input_subsystem, profiles.get(),
+                                                      system);
     });
     connect(advanced, &ConfigureInputAdvanced::CallMouseConfigDialog, [this, input_subsystem] {
         CallConfigureDialog<ConfigureMouseAdvanced>(*this, input_subsystem);
@@ -204,7 +204,7 @@ void ConfigureInput::ApplyConfiguration() {
 
     const bool pre_docked_mode = Settings::values.use_docked_mode.GetValue();
     Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked());
-    OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode.GetValue());
+    OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode.GetValue(), system);
 
     Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
     Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());

src/yuzu/configuration/configure_input.h

@@ -11,6 +11,10 @@
 #include <QList>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 class QCheckBox;
 class QString;
 class QTimer;
@@ -28,13 +32,13 @@ namespace Ui {
 class ConfigureInput;
 }
 
-void OnDockedModeChanged(bool last_state, bool new_state);
+void OnDockedModeChanged(bool last_state, bool new_state, Core::System& system);
 
 class ConfigureInput : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureInput(QWidget* parent = nullptr);
+    explicit ConfigureInput(Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureInput() override;
 
     /// Initializes the input dialog with the given input subsystem.
@@ -69,4 +73,6 @@ private:
     std::array<QWidget*, 8> player_tabs;
     std::array<QCheckBox*, 8> player_connected;
     ConfigureInputAdvanced* advanced;
+
+    Core::System& system;
 };

src/yuzu/configuration/configure_input_player.cpp

@@ -44,8 +44,7 @@ namespace {
 constexpr std::size_t HANDHELD_INDEX = 8;
 
 void UpdateController(Settings::ControllerType controller_type, std::size_t npad_index,
-                      bool connected) {
-    Core::System& system{Core::System::GetInstance()};
+                      bool connected, Core::System& system) {
     if (!system.IsPoweredOn()) {
         return;
     }
@@ -232,11 +231,12 @@ QString AnalogToText(const Common::ParamPackage& param, const std::string& dir)
 ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_index,
                                            QWidget* bottom_row,
                                            InputCommon::InputSubsystem* input_subsystem_,
-                                           InputProfiles* profiles_, bool debug)
+                                           InputProfiles* profiles_, Core::System& system_,
+                                           bool debug)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureInputPlayer>()), player_index(player_index),
       debug(debug), input_subsystem{input_subsystem_}, profiles(profiles_),
       timeout_timer(std::make_unique<QTimer>()), poll_timer(std::make_unique<QTimer>()),
-      bottom_row(bottom_row) {
+      bottom_row(bottom_row), system{system_} {
     ui->setupUi(this);
 
     setFocusPolicy(Qt::ClickFocus);
@@ -683,7 +683,7 @@ void ConfigureInputPlayer::TryConnectSelectedController() {
                                         controller_type == Settings::ControllerType::Handheld;
         // Connect only if handheld is going from disconnected to connected
         if (!handheld.connected && handheld_connected) {
-            UpdateController(controller_type, HANDHELD_INDEX, true);
+            UpdateController(controller_type, HANDHELD_INDEX, true, system);
         }
         handheld.connected = handheld_connected;
     }
@@ -703,7 +703,7 @@ void ConfigureInputPlayer::TryConnectSelectedController() {
         return;
     }
 
-    UpdateController(controller_type, player_index, true);
+    UpdateController(controller_type, player_index, true, system);
 }
 
 void ConfigureInputPlayer::TryDisconnectSelectedController() {
@@ -721,7 +721,7 @@ void ConfigureInputPlayer::TryDisconnectSelectedController() {
                                         controller_type == Settings::ControllerType::Handheld;
         // Disconnect only if handheld is going from connected to disconnected
         if (handheld.connected && !handheld_connected) {
-            UpdateController(controller_type, HANDHELD_INDEX, false);
+            UpdateController(controller_type, HANDHELD_INDEX, false, system);
         }
         return;
     }
@@ -737,7 +737,7 @@ void ConfigureInputPlayer::TryDisconnectSelectedController() {
     }
 
     // Disconnect the controller first.
-    UpdateController(controller_type, player_index, false);
+    UpdateController(controller_type, player_index, false, system);
 }
 
 void ConfigureInputPlayer::showEvent(QShowEvent* event) {
@@ -1017,8 +1017,6 @@ void ConfigureInputPlayer::SetConnectableControllers() {
         }
     };
 
-    Core::System& system{Core::System::GetInstance()};
-
     if (!system.IsPoweredOn()) {
         add_controllers(true);
         return;

src/yuzu/configuration/configure_input_player.h

@@ -29,6 +29,10 @@ class QWidget;
 
 class InputProfiles;
 
+namespace Core {
+class System;
+}
+
 namespace InputCommon {
 class InputSubsystem;
 }
@@ -48,7 +52,8 @@ class ConfigureInputPlayer : public QWidget {
 public:
     explicit ConfigureInputPlayer(QWidget* parent, std::size_t player_index, QWidget* bottom_row,
                                   InputCommon::InputSubsystem* input_subsystem_,
-                                  InputProfiles* profiles_, bool debug = false);
+                                  InputProfiles* profiles_, Core::System& system_,
+                                  bool debug = false);
     ~ConfigureInputPlayer() override;
 
     /// Save all button configurations to settings file.
@@ -233,4 +238,6 @@ private:
     /// ConfigureInput widget. On show, add this widget to the main layout. This will change the
     /// parent of the widget to this widget (but thats fine).
     QWidget* bottom_row;
+
+    Core::System& system;
 };

src/yuzu/configuration/configure_input_player_widget.cpp

@@ -1837,7 +1837,7 @@ void PlayerControlPreview::DrawLeftBody(QPainter& p, const QPointF center) {
     const float led_size = 5.0f;
     const QPointF led_position = sideview_center + QPointF(0, -36);
     int led_count = 0;
-    for (const auto color : led_color) {
+    for (const auto& color : led_color) {
         p.setBrush(color);
         DrawRectangle(p, led_position + QPointF(0, 12 * led_count++), led_size, led_size);
     }
@@ -1933,7 +1933,7 @@ void PlayerControlPreview::DrawRightBody(QPainter& p, const QPointF center) {
     const float led_size = 5.0f;
     const QPointF led_position = sideview_center + QPointF(0, -36);
     int led_count = 0;
-    for (const auto color : led_color) {
+    for (const auto& color : led_color) {
         p.setBrush(color);
         DrawRectangle(p, led_position + QPointF(0, 12 * led_count++), led_size, led_size);
     }

src/yuzu/configuration/configure_input_profile_dialog.cpp

@@ -2,14 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/core.h"
 #include "ui_configure_input_profile_dialog.h"
 #include "yuzu/configuration/configure_input_player.h"
 #include "yuzu/configuration/configure_input_profile_dialog.h"
 
 ConfigureInputProfileDialog::ConfigureInputProfileDialog(
-    QWidget* parent, InputCommon::InputSubsystem* input_subsystem, InputProfiles* profiles)
+    QWidget* parent, InputCommon::InputSubsystem* input_subsystem, InputProfiles* profiles,
+    Core::System& system)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigureInputProfileDialog>()),
-      profile_widget(new ConfigureInputPlayer(this, 9, nullptr, input_subsystem, profiles, false)) {
+      profile_widget(
+          new ConfigureInputPlayer(this, 9, nullptr, input_subsystem, profiles, system, false)) {
     ui->setupUi(this);
 
     ui->controllerLayout->addWidget(profile_widget);

src/yuzu/configuration/configure_input_profile_dialog.h

@@ -13,6 +13,10 @@ class ConfigureInputPlayer;
 
 class InputProfiles;
 
+namespace Core {
+class System;
+}
+
 namespace InputCommon {
 class InputSubsystem;
 }
@@ -27,7 +31,7 @@ class ConfigureInputProfileDialog : public QDialog {
 public:
     explicit ConfigureInputProfileDialog(QWidget* parent,
                                          InputCommon::InputSubsystem* input_subsystem,
-                                         InputProfiles* profiles);
+                                         InputProfiles* profiles, Core::System& system);
     ~ConfigureInputProfileDialog() override;
 
 private:

src/yuzu/configuration/configure_network.cpp

@@ -10,8 +10,8 @@
 #include "ui_configure_network.h"
 #include "yuzu/configuration/configure_network.h"
 
-ConfigureNetwork::ConfigureNetwork(QWidget* parent)
-    : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()) {
+ConfigureNetwork::ConfigureNetwork(const Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()), system{system_} {
     ui->setupUi(this);
 
     ui->network_interface->addItem(tr("None"));
@@ -33,7 +33,7 @@ void ConfigureNetwork::RetranslateUi() {
 }
 
 void ConfigureNetwork::SetConfiguration() {
-    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
+    const bool runtime_lock = !system.IsPoweredOn();
 
     const std::string& network_interface = Settings::values.network_interface.GetValue();
 

src/yuzu/configuration/configure_network.h

@@ -16,7 +16,7 @@ class ConfigureNetwork : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureNetwork(QWidget* parent = nullptr);
+    explicit ConfigureNetwork(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureNetwork() override;
 
     void ApplyConfiguration();
@@ -26,4 +26,6 @@ private:
     void SetConfiguration();
 
     std::unique_ptr<Ui::ConfigureNetwork> ui;
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_network.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>Network</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">

src/yuzu/configuration/configure_per_game.cpp

@@ -30,32 +30,56 @@
 #include "core/loader/loader.h"
 #include "ui_configure_per_game.h"
 #include "yuzu/configuration/config.h"
+#include "yuzu/configuration/configure_audio.h"
+#include "yuzu/configuration/configure_cpu.h"
+#include "yuzu/configuration/configure_general.h"
+#include "yuzu/configuration/configure_graphics.h"
+#include "yuzu/configuration/configure_graphics_advanced.h"
 #include "yuzu/configuration/configure_input.h"
 #include "yuzu/configuration/configure_per_game.h"
+#include "yuzu/configuration/configure_per_game_addons.h"
+#include "yuzu/configuration/configure_system.h"
 #include "yuzu/uisettings.h"
 #include "yuzu/util/util.h"
 
-ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, const std::string& file_name)
-    : QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()), title_id(title_id) {
+ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, const std::string& file_name,
+                                   Core::System& system_)
+    : QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()),
+      title_id(title_id), system{system_}, addons_tab{std::make_unique<ConfigurePerGameAddons>(
+                                               system_, this)},
+      audio_tab{std::make_unique<ConfigureAudio>(system_, this)},
+      cpu_tab{std::make_unique<ConfigureCpu>(system_, this)},
+      general_tab{std::make_unique<ConfigureGeneral>(system_, this)},
+      graphics_tab{std::make_unique<ConfigureGraphics>(system_, this)},
+      graphics_advanced_tab{std::make_unique<ConfigureGraphicsAdvanced>(system_, this)},
+      system_tab{std::make_unique<ConfigureSystem>(system_, this)} {
     const auto file_path = std::filesystem::path(Common::FS::ToU8String(file_name));
     const auto config_file_name = title_id == 0 ? Common::FS::PathToUTF8String(file_path.filename())
                                                 : fmt::format("{:016X}", title_id);
-    game_config = std::make_unique<Config>(config_file_name, Config::ConfigType::PerGameConfig);
-
-    Settings::SetConfiguringGlobal(false);
+    game_config =
+        std::make_unique<Config>(system, config_file_name, Config::ConfigType::PerGameConfig);
 
     ui->setupUi(this);
+
+    ui->tabWidget->addTab(addons_tab.get(), tr("Add-Ons"));
+    ui->tabWidget->addTab(general_tab.get(), tr("General"));
+    ui->tabWidget->addTab(system_tab.get(), tr("System"));
+    ui->tabWidget->addTab(cpu_tab.get(), tr("CPU"));
+    ui->tabWidget->addTab(graphics_tab.get(), tr("Graphics"));
+    ui->tabWidget->addTab(graphics_advanced_tab.get(), tr("GraphicsAdvanced"));
+    ui->tabWidget->addTab(audio_tab.get(), tr("Audio"));
+
     setFocusPolicy(Qt::ClickFocus);
     setWindowTitle(tr("Properties"));
     // remove Help question mark button from the title bar
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-    ui->addonsTab->SetTitleId(title_id);
+    addons_tab->SetTitleId(title_id);
 
     scene = new QGraphicsScene;
     ui->icon_view->setScene(scene);
 
-    if (Core::System::GetInstance().IsPoweredOn()) {
+    if (system.IsPoweredOn()) {
         QPushButton* apply_button = ui->buttonBox->addButton(QDialogButtonBox::Apply);
         connect(apply_button, &QAbstractButton::clicked, this,
                 &ConfigurePerGame::HandleApplyButtonClicked);
@@ -67,15 +91,15 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, const std::str
 ConfigurePerGame::~ConfigurePerGame() = default;
 
 void ConfigurePerGame::ApplyConfiguration() {
-    ui->addonsTab->ApplyConfiguration();
-    ui->generalTab->ApplyConfiguration();
-    ui->cpuTab->ApplyConfiguration();
-    ui->systemTab->ApplyConfiguration();
-    ui->graphicsTab->ApplyConfiguration();
-    ui->graphicsAdvancedTab->ApplyConfiguration();
-    ui->audioTab->ApplyConfiguration();
+    addons_tab->ApplyConfiguration();
+    general_tab->ApplyConfiguration();
+    cpu_tab->ApplyConfiguration();
+    system_tab->ApplyConfiguration();
+    graphics_tab->ApplyConfiguration();
+    graphics_advanced_tab->ApplyConfiguration();
+    audio_tab->ApplyConfiguration();
 
-    Core::System::GetInstance().ApplySettings();
+    system.ApplySettings();
     Settings::LogSettings();
 
     game_config->Save();
@@ -108,12 +132,11 @@ void ConfigurePerGame::LoadConfiguration() {
         return;
     }
 
-    ui->addonsTab->LoadFromFile(file);
+    addons_tab->LoadFromFile(file);
 
     ui->display_title_id->setText(
         QStringLiteral("%1").arg(title_id, 16, 16, QLatin1Char{'0'}).toUpper());
 
-    auto& system = Core::System::GetInstance();
     const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
                                    system.GetContentProvider()};
     const auto control = pm.GetControlMetadata();
@@ -164,4 +187,11 @@ void ConfigurePerGame::LoadConfiguration() {
 
     const auto valueText = ReadableByteSize(file->GetSize());
     ui->display_size->setText(valueText);
+
+    general_tab->SetConfiguration();
+    cpu_tab->SetConfiguration();
+    system_tab->SetConfiguration();
+    graphics_tab->SetConfiguration();
+    graphics_advanced_tab->SetConfiguration();
+    audio_tab->SetConfiguration();
 }

src/yuzu/configuration/configure_per_game.h

@@ -14,6 +14,18 @@
 #include "core/file_sys/vfs_types.h"
 #include "yuzu/configuration/config.h"
 
+namespace Core {
+class System;
+}
+
+class ConfigurePerGameAddons;
+class ConfigureAudio;
+class ConfigureCpu;
+class ConfigureGeneral;
+class ConfigureGraphics;
+class ConfigureGraphicsAdvanced;
+class ConfigureSystem;
+
 class QGraphicsScene;
 class QStandardItem;
 class QStandardItemModel;
@@ -29,7 +41,8 @@ class ConfigurePerGame : public QDialog {
 
 public:
     // Cannot use std::filesystem::path due to https://bugreports.qt.io/browse/QTBUG-73263
-    explicit ConfigurePerGame(QWidget* parent, u64 title_id, const std::string& file_name);
+    explicit ConfigurePerGame(QWidget* parent, u64 title_id, const std::string& file_name,
+                              Core::System& system_);
     ~ConfigurePerGame() override;
 
     /// Save all button configurations to settings file
@@ -52,4 +65,14 @@ private:
     QGraphicsScene* scene;
 
     std::unique_ptr<Config> game_config;
+
+    Core::System& system;
+
+    std::unique_ptr<ConfigurePerGameAddons> addons_tab;
+    std::unique_ptr<ConfigureAudio> audio_tab;
+    std::unique_ptr<ConfigureCpu> cpu_tab;
+    std::unique_ptr<ConfigureGeneral> general_tab;
+    std::unique_ptr<ConfigureGraphics> graphics_tab;
+    std::unique_ptr<ConfigureGraphicsAdvanced> graphics_advanced_tab;
+    std::unique_ptr<ConfigureSystem> system_tab;
 };

src/yuzu/configuration/configure_per_game.ui

@@ -7,12 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>900</width>
-    <height>600</height>
+    <height>630</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>900</width>
+    <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -214,7 +215,7 @@
           <bool>true</bool>
          </property>
          <property name="currentIndex">
-          <number>0</number>
+          <number>-1</number>
          </property>
          <property name="usesScrollButtons">
           <bool>true</bool>
@@ -225,41 +226,6 @@
          <property name="tabsClosable">
           <bool>false</bool>
          </property>
-         <widget class="ConfigurePerGameAddons" name="addonsTab">
-          <attribute name="title">
-           <string>Add-Ons</string>
-          </attribute>
-         </widget>
-         <widget class="ConfigureGeneral" name="generalTab">
-          <attribute name="title">
-           <string>General</string>
-          </attribute>
-         </widget>
-         <widget class="ConfigureSystem" name="systemTab">
-          <attribute name="title">
-           <string>System</string>
-          </attribute>
-         </widget>
-         <widget class="ConfigureCpu" name="cpuTab">
-          <attribute name="title">
-           <string>CPU</string>
-          </attribute>
-         </widget>
-         <widget class="ConfigureGraphics" name="graphicsTab">
-          <attribute name="title">
-           <string>Graphics</string>
-          </attribute>
-         </widget>
-         <widget class="ConfigureGraphicsAdvanced" name="graphicsAdvancedTab">
-          <attribute name="title">
-           <string>Adv. Graphics</string>
-          </attribute>
-         </widget>
-         <widget class="ConfigureAudio" name="audioTab">
-          <attribute name="title">
-           <string>Audio</string>
-          </attribute>
-         </widget>
         </widget>
        </item>
       </layout>
@@ -284,50 +250,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>ConfigureGeneral</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_general.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureSystem</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_system.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureAudio</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_audio.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureGraphics</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_graphics.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureGraphicsAdvanced</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_graphics_advanced.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigurePerGameAddons</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_per_game_addons.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ConfigureCpu</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_cpu.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>
@@ -335,12 +257,32 @@
    <signal>accepted()</signal>
    <receiver>ConfigurePerGame</receiver>
    <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>ConfigurePerGame</receiver>
    <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
   </connection>
  </connections>
 </ui>

src/yuzu/configuration/configure_per_game_addons.cpp

@@ -26,8 +26,8 @@
 #include "yuzu/uisettings.h"
 #include "yuzu/util/util.h"
 
-ConfigurePerGameAddons::ConfigurePerGameAddons(QWidget* parent)
-    : QWidget(parent), ui(new Ui::ConfigurePerGameAddons) {
+ConfigurePerGameAddons::ConfigurePerGameAddons(Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigurePerGameAddons), system{system_} {
     ui->setupUi(this);
 
     layout = new QVBoxLayout;
@@ -58,7 +58,7 @@ ConfigurePerGameAddons::ConfigurePerGameAddons(QWidget* parent)
 
     ui->scrollArea->setLayout(layout);
 
-    ui->scrollArea->setEnabled(!Core::System::GetInstance().IsPoweredOn());
+    ui->scrollArea->setEnabled(!system.IsPoweredOn());
 
     connect(item_model, &QStandardItemModel::itemChanged,
             [] { UISettings::values.is_game_list_reload_pending.exchange(true); });
@@ -112,7 +112,6 @@ void ConfigurePerGameAddons::LoadConfiguration() {
         return;
     }
 
-    auto& system = Core::System::GetInstance();
     const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
                                    system.GetContentProvider()};
     const auto loader = Loader::GetLoader(system, file);

src/yuzu/configuration/configure_per_game_addons.h

@@ -11,6 +11,10 @@
 
 #include "core/file_sys/vfs_types.h"
 
+namespace Core {
+class System;
+}
+
 class QGraphicsScene;
 class QStandardItem;
 class QStandardItemModel;
@@ -25,7 +29,7 @@ class ConfigurePerGameAddons : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigurePerGameAddons(QWidget* parent = nullptr);
+    explicit ConfigurePerGameAddons(Core::System& system_, QWidget* parent = nullptr);
     ~ConfigurePerGameAddons() override;
 
     /// Save all button configurations to settings file
@@ -50,4 +54,6 @@ private:
     QStandardItemModel* item_model;
 
     std::vector<QList<QStandardItem*>> list_items;
+
+    Core::System& system;
 };

src/yuzu/configuration/configure_per_game_addons.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleDescription">
+   <string>Add-Ons</string>
+  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QScrollArea" name="scrollArea">

src/yuzu/configuration/configure_profile_manager.cpp

@@ -76,9 +76,9 @@ QString GetProfileUsernameFromUser(QWidget* parent, const QString& description_t
 }
 } // Anonymous namespace
 
-ConfigureProfileManager::ConfigureProfileManager(QWidget* parent)
+ConfigureProfileManager::ConfigureProfileManager(const Core::System& system_, QWidget* parent)
     : QWidget(parent), ui(new Ui::ConfigureProfileManager),
-      profile_manager(std::make_unique<Service::Account::ProfileManager>()) {
+      profile_manager(std::make_unique<Service::Account::ProfileManager>()), system{system_} {
     ui->setupUi(this);
 
     tree_view = new QTreeView;
@@ -137,7 +137,7 @@ void ConfigureProfileManager::RetranslateUI() {
 }
 
 void ConfigureProfileManager::SetConfiguration() {
-    enabled = !Core::System::GetInstance().IsPoweredOn();
+    enabled = !system.IsPoweredOn();
     item_model->removeRows(0, item_model->rowCount());
     list_items.clear();
 
@@ -180,8 +180,6 @@ void ConfigureProfileManager::ApplyConfiguration() {
     if (!enabled) {
         return;
     }
-
-    Core::System::GetInstance().ApplySettings();
 }
 
 void ConfigureProfileManager::SelectUser(const QModelIndex& index) {

src/yuzu/configuration/configure_profile_manager.h

@@ -9,6 +9,10 @@
 #include <QList>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 class QGraphicsScene;
 class QStandardItem;
 class QStandardItemModel;
@@ -27,7 +31,7 @@ class ConfigureProfileManager : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureProfileManager(QWidget* parent = nullptr);
+    explicit ConfigureProfileManager(const Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureProfileManager() override;
 
     void ApplyConfiguration();
@@ -58,4 +62,6 @@ private:
     bool enabled = false;
 
     std::unique_ptr<Service::Account::ProfileManager> profile_manager;
+
+    const Core::System& system;
 };

src/yuzu/configuration/configure_profile_manager.ui

@@ -6,13 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>366</width>
+    <width>390</width>
     <height>483</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>Profiles</string>
+  </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">

src/yuzu/configuration/configure_system.cpp

@@ -17,7 +17,8 @@
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_system.h"
 
-ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) {
+ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureSystem), system{system_} {
     ui->setupUi(this);
     connect(ui->button_regenerate_console_id, &QPushButton::clicked, this,
             &ConfigureSystem::RefreshConsoleID);
@@ -59,7 +60,7 @@ void ConfigureSystem::RetranslateUI() {
 }
 
 void ConfigureSystem::SetConfiguration() {
-    enabled = !Core::System::GetInstance().IsPoweredOn();
+    enabled = !system.IsPoweredOn();
     const auto rng_seed =
         QStringLiteral("%1")
             .arg(Settings::values.rng_seed.GetValue().value_or(0), 8, 16, QLatin1Char{'0'})
@@ -103,8 +104,6 @@ void ConfigureSystem::SetConfiguration() {
 void ConfigureSystem::ReadSystemSettings() {}
 
 void ConfigureSystem::ApplyConfiguration() {
-    auto& system = Core::System::GetInstance();
-
     // Allow setting custom RTC even if system is powered on,
     // to allow in-game time to be fast forwarded
     if (Settings::IsConfiguringGlobal()) {
@@ -162,8 +161,6 @@ void ConfigureSystem::ApplyConfiguration() {
             break;
         }
     }
-
-    system.ApplySettings();
 }
 
 void ConfigureSystem::RefreshConsoleID() {

src/yuzu/configuration/configure_system.h

@@ -9,6 +9,10 @@
 #include <QList>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 namespace ConfigurationShared {
 enum class CheckState;
 }
@@ -21,17 +25,16 @@ class ConfigureSystem : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureSystem(QWidget* parent = nullptr);
+    explicit ConfigureSystem(Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureSystem() override;
 
     void ApplyConfiguration();
+    void SetConfiguration();
 
 private:
     void changeEvent(QEvent* event) override;
     void RetranslateUI();
 
-    void SetConfiguration();
-
     void ReadSystemSettings();
 
     void RefreshConsoleID();
@@ -48,4 +51,6 @@ private:
 
     ConfigurationShared::CheckState use_rng_seed;
     ConfigurationShared::CheckState use_custom_rtc;
+
+    Core::System& system;
 };

src/yuzu/configuration/configure_system.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>System</string>
+  </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">

src/yuzu/configuration/configure_tas.ui

@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>ConfigureTas</class>
  <widget class="QDialog" name="ConfigureTas">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>337</width>
-    <height>316</height>
-   </rect>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout_1">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_1">

src/yuzu/configuration/configure_ui.cpp

@@ -54,7 +54,8 @@ QString GetTranslatedRowTextName(size_t index) {
 }
 } // Anonymous namespace
 
-ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureUi) {
+ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureUi), system{system_} {
     ui->setupUi(this);
 
     InitializeLanguageComboBox();
@@ -116,7 +117,7 @@ void ConfigureUi::ApplyConfiguration() {
     UISettings::values.enable_screenshot_save_as = ui->enable_screenshot_save_as->isChecked();
     Common::FS::SetYuzuPath(Common::FS::YuzuPath::ScreenshotsDir,
                             ui->screenshot_path_edit->text().toStdString());
-    Core::System::GetInstance().ApplySettings();
+    system.ApplySettings();
 }
 
 void ConfigureUi::RequestGameListUpdate() {

src/yuzu/configuration/configure_ui.h

@@ -7,6 +7,10 @@
 #include <memory>
 #include <QWidget>
 
+namespace Core {
+class System;
+}
+
 namespace Ui {
 class ConfigureUi;
 }
@@ -15,7 +19,7 @@ class ConfigureUi : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureUi(QWidget* parent = nullptr);
+    explicit ConfigureUi(Core::System& system_, QWidget* parent = nullptr);
     ~ConfigureUi() override;
 
     void ApplyConfiguration();
@@ -42,4 +46,6 @@ private:
     void UpdateSecondRowComboBox(bool init = false);
 
     std::unique_ptr<Ui::ConfigureUi> ui;
+
+    Core::System& system;
 };

src/yuzu/configuration/configure_ui.ui

@@ -7,12 +7,15 @@
     <x>0</x>
     <y>0</y>
     <width>363</width>
-    <height>391</height>
+    <height>507</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>UI</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="general_groupBox">

src/yuzu/configuration/configure_web.ui

@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="accessibleName">
+   <string>Web</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -55,7 +58,7 @@
            </widget>
           </item>
           <item row="0" column="1" colspan="3">
-           <widget class="QLabel" name="username" />
+           <widget class="QLabel" name="username"/>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_token">
@@ -65,8 +68,7 @@
            </widget>
           </item>
           <item row="1" column="4">
-           <widget class="QLabel" name="label_token_verified">
-           </widget>
+           <widget class="QLabel" name="label_token_verified"/>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_username">
@@ -163,20 +165,20 @@
     </layout>
    </item>
    <item>
-     <widget class="QGroupBox" name="discord_group">
-      <property name="title">
-       <string>Discord Presence</string>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_21">
-       <item>
-        <widget class="QCheckBox" name="toggle_discordrpc">
-         <property name="text">
-          <string>Show Current Game in your Discord Status</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
+    <widget class="QGroupBox" name="discord_group">
+     <property name="title">
+      <string>Discord Presence</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_21">
+      <item>
+       <widget class="QCheckBox" name="toggle_discordrpc">
+        <property name="text">
+         <string>Show Current Game in your Discord Status</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">

src/yuzu/configuration/input_profiles.cpp

@@ -28,7 +28,7 @@ std::filesystem::path GetNameWithoutExtension(std::filesystem::path filename) {
 
 } // namespace
 
-InputProfiles::InputProfiles() {
+InputProfiles::InputProfiles(Core::System& system_) : system{system_} {
     const auto input_profile_loc = FS::GetYuzuPath(FS::YuzuPath::ConfigDir) / "input";
 
     if (!FS::IsDir(input_profile_loc)) {
@@ -44,8 +44,8 @@ InputProfiles::InputProfiles() {
 
             if (IsINI(filename) && IsProfileNameValid(name_without_ext)) {
                 map_profiles.insert_or_assign(
-                    name_without_ext,
-                    std::make_unique<Config>(name_without_ext, Config::ConfigType::InputProfile));
+                    name_without_ext, std::make_unique<Config>(system, name_without_ext,
+                                                               Config::ConfigType::InputProfile));
             }
 
             return true;
@@ -81,7 +81,8 @@ bool InputProfiles::CreateProfile(const std::string& profile_name, std::size_t p
     }
 
     map_profiles.insert_or_assign(
-        profile_name, std::make_unique<Config>(profile_name, Config::ConfigType::InputProfile));
+        profile_name,
+        std::make_unique<Config>(system, profile_name, Config::ConfigType::InputProfile));
 
     return SaveProfile(profile_name, player_index);
 }

src/yuzu/configuration/input_profiles.h

@@ -8,12 +8,16 @@
 #include <string_view>
 #include <unordered_map>
 
+namespace Core {
+class System;
+}
+
 class Config;
 
 class InputProfiles {
 
 public:
-    explicit InputProfiles();
+    explicit InputProfiles(Core::System& system_);
     virtual ~InputProfiles();
 
     std::vector<std::string> GetInputProfileNames();
@@ -29,4 +33,6 @@ private:
     bool ProfileExistsInMap(const std::string& profile_name) const;
 
     std::unordered_map<std::string, std::unique_ptr<Config>> map_profiles;
+
+    Core::System& system;
 };

src/yuzu/debugger/profiler.cpp

@@ -143,24 +143,28 @@ void MicroProfileWidget::hideEvent(QHideEvent* ev) {
 }
 
 void MicroProfileWidget::mouseMoveEvent(QMouseEvent* ev) {
-    MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0);
+    const auto mouse_position = ev->pos();
+    MicroProfileMousePosition(mouse_position.x() / x_scale, mouse_position.y() / y_scale, 0);
     ev->accept();
 }
 
 void MicroProfileWidget::mousePressEvent(QMouseEvent* ev) {
-    MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0);
+    const auto mouse_position = ev->pos();
+    MicroProfileMousePosition(mouse_position.x() / x_scale, mouse_position.y() / y_scale, 0);
     MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton);
     ev->accept();
 }
 
 void MicroProfileWidget::mouseReleaseEvent(QMouseEvent* ev) {
-    MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale, 0);
+    const auto mouse_position = ev->pos();
+    MicroProfileMousePosition(mouse_position.x() / x_scale, mouse_position.y() / y_scale, 0);
     MicroProfileMouseButton(ev->buttons() & Qt::LeftButton, ev->buttons() & Qt::RightButton);
     ev->accept();
 }
 
 void MicroProfileWidget::wheelEvent(QWheelEvent* ev) {
-    MicroProfileMousePosition(ev->pos().x() / x_scale, ev->pos().y() / y_scale,
+    const auto wheel_position = ev->position().toPoint();
+    MicroProfileMousePosition(wheel_position.x() / x_scale, wheel_position.y() / y_scale,
                               ev->angleDelta().y() / 120);
     ev->accept();
 }

src/yuzu/debugger/wait_tree.cpp

@@ -89,20 +89,20 @@ std::size_t WaitTreeItem::Row() const {
     return row;
 }
 
-std::vector<std::unique_ptr<WaitTreeThread>> WaitTreeItem::MakeThreadItemList() {
+std::vector<std::unique_ptr<WaitTreeThread>> WaitTreeItem::MakeThreadItemList(
+    Core::System& system) {
     std::vector<std::unique_ptr<WaitTreeThread>> item_list;
     std::size_t row = 0;
     auto add_threads = [&](const std::vector<Kernel::KThread*>& threads) {
         for (std::size_t i = 0; i < threads.size(); ++i) {
             if (threads[i]->GetThreadTypeForDebugging() == Kernel::ThreadType::User) {
-                item_list.push_back(std::make_unique<WaitTreeThread>(*threads[i]));
+                item_list.push_back(std::make_unique<WaitTreeThread>(*threads[i], system));
                 item_list.back()->row = row;
             }
             ++row;
         }
     };
 
-    const auto& system = Core::System::GetInstance();
     add_threads(system.GlobalSchedulerContext().GetThreadList());
 
     return item_list;
@@ -115,9 +115,10 @@ QString WaitTreeText::GetText() const {
     return text;
 }
 
-WaitTreeMutexInfo::WaitTreeMutexInfo(VAddr mutex_address, const Kernel::KHandleTable& handle_table)
-    : mutex_address(mutex_address) {
-    mutex_value = Core::System::GetInstance().Memory().Read32(mutex_address);
+WaitTreeMutexInfo::WaitTreeMutexInfo(VAddr mutex_address, const Kernel::KHandleTable& handle_table,
+                                     Core::System& system_)
+    : mutex_address(mutex_address), system{system_} {
+    mutex_value = system.Memory().Read32(mutex_address);
     owner_handle = static_cast<Kernel::Handle>(mutex_value & Kernel::Svc::HandleWaitMask);
     owner = handle_table.GetObject<Kernel::KThread>(owner_handle).GetPointerUnsafe();
 }
@@ -136,12 +137,13 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeMutexInfo::GetChildren() cons
     list.push_back(std::make_unique<WaitTreeText>(
         tr("owner handle: 0x%1").arg(owner_handle, 8, 16, QLatin1Char{'0'})));
     if (owner != nullptr) {
-        list.push_back(std::make_unique<WaitTreeThread>(*owner));
+        list.push_back(std::make_unique<WaitTreeThread>(*owner, system));
     }
     return list;
 }
 
-WaitTreeCallstack::WaitTreeCallstack(const Kernel::KThread& thread) : thread(thread) {}
+WaitTreeCallstack::WaitTreeCallstack(const Kernel::KThread& thread, Core::System& system_)
+    : thread(thread), system{system_} {}
 WaitTreeCallstack::~WaitTreeCallstack() = default;
 
 QString WaitTreeCallstack::GetText() const {
@@ -159,8 +161,7 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeCallstack::GetChildren() cons
         return list;
     }
 
-    auto backtrace = Core::ARM_Interface::GetBacktraceFromContext(Core::System::GetInstance(),
-                                                                  thread.GetContext64());
+    auto backtrace = Core::ARM_Interface::GetBacktraceFromContext(system, thread.GetContext64());
 
     for (auto& entry : backtrace) {
         std::string s = fmt::format("{:20}{:016X} {:016X} {:016X} {}", entry.module, entry.address,
@@ -172,8 +173,8 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeCallstack::GetChildren() cons
 }
 
 WaitTreeSynchronizationObject::WaitTreeSynchronizationObject(
-    const Kernel::KSynchronizationObject& o)
-    : object(o) {}
+    const Kernel::KSynchronizationObject& o, Core::System& system_)
+    : object(o), system{system_} {}
 WaitTreeSynchronizationObject::~WaitTreeSynchronizationObject() = default;
 
 WaitTreeExpandableItem::WaitTreeExpandableItem() = default;
@@ -191,16 +192,18 @@ QString WaitTreeSynchronizationObject::GetText() const {
 }
 
 std::unique_ptr<WaitTreeSynchronizationObject> WaitTreeSynchronizationObject::make(
-    const Kernel::KSynchronizationObject& object) {
+    const Kernel::KSynchronizationObject& object, Core::System& system) {
     const auto type =
         static_cast<Kernel::KClassTokenGenerator::ObjectType>(object.GetTypeObj().GetClassToken());
     switch (type) {
     case Kernel::KClassTokenGenerator::ObjectType::KReadableEvent:
-        return std::make_unique<WaitTreeEvent>(static_cast<const Kernel::KReadableEvent&>(object));
+        return std::make_unique<WaitTreeEvent>(static_cast<const Kernel::KReadableEvent&>(object),
+                                               system);
     case Kernel::KClassTokenGenerator::ObjectType::KThread:
-        return std::make_unique<WaitTreeThread>(static_cast<const Kernel::KThread&>(object));
+        return std::make_unique<WaitTreeThread>(static_cast<const Kernel::KThread&>(object),
+                                                system);
     default:
-        return std::make_unique<WaitTreeSynchronizationObject>(object);
+        return std::make_unique<WaitTreeSynchronizationObject>(object, system);
     }
 }
 
@@ -211,15 +214,15 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeSynchronizationObject::GetChi
     if (threads.empty()) {
         list.push_back(std::make_unique<WaitTreeText>(tr("waited by no thread")));
     } else {
-        list.push_back(std::make_unique<WaitTreeThreadList>(std::move(threads)));
+        list.push_back(std::make_unique<WaitTreeThreadList>(std::move(threads), system));
     }
 
     return list;
 }
 
 WaitTreeObjectList::WaitTreeObjectList(const std::vector<Kernel::KSynchronizationObject*>& list,
-                                       bool w_all)
-    : object_list(list), wait_all(w_all) {}
+                                       bool w_all, Core::System& system_)
+    : object_list(list), wait_all(w_all), system{system_} {}
 
 WaitTreeObjectList::~WaitTreeObjectList() = default;
 
@@ -231,13 +234,14 @@ QString WaitTreeObjectList::GetText() const {
 
 std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeObjectList::GetChildren() const {
     std::vector<std::unique_ptr<WaitTreeItem>> list(object_list.size());
-    std::transform(object_list.begin(), object_list.end(), list.begin(),
-                   [](const auto& t) { return WaitTreeSynchronizationObject::make(*t); });
+    std::transform(object_list.begin(), object_list.end(), list.begin(), [this](const auto& t) {
+        return WaitTreeSynchronizationObject::make(*t, system);
+    });
     return list;
 }
 
-WaitTreeThread::WaitTreeThread(const Kernel::KThread& thread)
-    : WaitTreeSynchronizationObject(thread) {}
+WaitTreeThread::WaitTreeThread(const Kernel::KThread& thread, Core::System& system_)
+    : WaitTreeSynchronizationObject(thread, system_), system{system_} {}
 WaitTreeThread::~WaitTreeThread() = default;
 
 QString WaitTreeThread::GetText() const {
@@ -360,7 +364,8 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {
     const VAddr mutex_wait_address = thread.GetMutexWaitAddressForDebugging();
     if (mutex_wait_address != 0) {
         const auto& handle_table = thread.GetOwnerProcess()->GetHandleTable();
-        list.push_back(std::make_unique<WaitTreeMutexInfo>(mutex_wait_address, handle_table));
+        list.push_back(
+            std::make_unique<WaitTreeMutexInfo>(mutex_wait_address, handle_table, system));
     } else {
         list.push_back(std::make_unique<WaitTreeText>(tr("not waiting for mutex")));
     }
@@ -369,20 +374,20 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {
         thread.GetWaitReasonForDebugging() ==
             Kernel::ThreadWaitReasonForDebugging::Synchronization) {
         list.push_back(std::make_unique<WaitTreeObjectList>(thread.GetWaitObjectsForDebugging(),
-                                                            thread.IsCancellable()));
+                                                            thread.IsCancellable(), system));
     }
 
-    list.push_back(std::make_unique<WaitTreeCallstack>(thread));
+    list.push_back(std::make_unique<WaitTreeCallstack>(thread, system));
 
     return list;
 }
 
-WaitTreeEvent::WaitTreeEvent(const Kernel::KReadableEvent& object)
-    : WaitTreeSynchronizationObject(object) {}
+WaitTreeEvent::WaitTreeEvent(const Kernel::KReadableEvent& object, Core::System& system_)
+    : WaitTreeSynchronizationObject(object, system_) {}
 WaitTreeEvent::~WaitTreeEvent() = default;
 
-WaitTreeThreadList::WaitTreeThreadList(std::vector<Kernel::KThread*>&& list)
-    : thread_list(std::move(list)) {}
+WaitTreeThreadList::WaitTreeThreadList(std::vector<Kernel::KThread*>&& list, Core::System& system_)
+    : thread_list(std::move(list)), system{system_} {}
 WaitTreeThreadList::~WaitTreeThreadList() = default;
 
 QString WaitTreeThreadList::GetText() const {
@@ -392,11 +397,12 @@ QString WaitTreeThreadList::GetText() const {
 std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThreadList::GetChildren() const {
     std::vector<std::unique_ptr<WaitTreeItem>> list(thread_list.size());
     std::transform(thread_list.begin(), thread_list.end(), list.begin(),
-                   [](const auto& t) { return std::make_unique<WaitTreeThread>(*t); });
+                   [this](const auto& t) { return std::make_unique<WaitTreeThread>(*t, system); });
     return list;
 }
 
-WaitTreeModel::WaitTreeModel(QObject* parent) : QAbstractItemModel(parent) {}
+WaitTreeModel::WaitTreeModel(Core::System& system_, QObject* parent)
+    : QAbstractItemModel(parent), system{system_} {}
 WaitTreeModel::~WaitTreeModel() = default;
 
 QModelIndex WaitTreeModel::index(int row, int column, const QModelIndex& parent) const {
@@ -455,10 +461,11 @@ void WaitTreeModel::ClearItems() {
 }
 
 void WaitTreeModel::InitItems() {
-    thread_items = WaitTreeItem::MakeThreadItemList();
+    thread_items = WaitTreeItem::MakeThreadItemList(system);
 }
 
-WaitTreeWidget::WaitTreeWidget(QWidget* parent) : QDockWidget(tr("&Wait Tree"), parent) {
+WaitTreeWidget::WaitTreeWidget(Core::System& system_, QWidget* parent)
+    : QDockWidget(tr("&Wait Tree"), parent), system{system_} {
     setObjectName(QStringLiteral("WaitTreeWidget"));
     view = new QTreeView(this);
     view->setHeaderHidden(true);
@@ -469,7 +476,7 @@ WaitTreeWidget::WaitTreeWidget(QWidget* parent) : QDockWidget(tr("&Wait Tree"),
 WaitTreeWidget::~WaitTreeWidget() = default;
 
 void WaitTreeWidget::OnDebugModeEntered() {
-    if (!Core::System::GetInstance().IsPoweredOn())
+    if (!system.IsPoweredOn())
         return;
     model->InitItems();
     view->setModel(model);
@@ -483,7 +490,7 @@ void WaitTreeWidget::OnDebugModeLeft() {
 }
 
 void WaitTreeWidget::OnEmulationStarting(EmuThread* emu_thread) {
-    model = new WaitTreeModel(this);
+    model = new WaitTreeModel(system, this);
     view->setModel(model);
     setEnabled(false);
 }

src/yuzu/debugger/wait_tree.h

@@ -18,6 +18,10 @@
 
 class EmuThread;
 
+namespace Core {
+class System;
+}
+
 namespace Kernel {
 class KHandleTable;
 class KReadableEvent;
@@ -42,7 +46,7 @@ public:
     WaitTreeItem* Parent() const;
     const std::vector<std::unique_ptr<WaitTreeItem>>& Children() const;
     std::size_t Row() const;
-    static std::vector<std::unique_ptr<WaitTreeThread>> MakeThreadItemList();
+    static std::vector<std::unique_ptr<WaitTreeThread>> MakeThreadItemList(Core::System& system);
 
 private:
     std::size_t row;
@@ -75,7 +79,8 @@ public:
 class WaitTreeMutexInfo : public WaitTreeExpandableItem {
     Q_OBJECT
 public:
-    explicit WaitTreeMutexInfo(VAddr mutex_address, const Kernel::KHandleTable& handle_table);
+    explicit WaitTreeMutexInfo(VAddr mutex_address, const Kernel::KHandleTable& handle_table,
+                               Core::System& system_);
     ~WaitTreeMutexInfo() override;
 
     QString GetText() const override;
@@ -86,12 +91,14 @@ private:
     u32 mutex_value{};
     Kernel::Handle owner_handle{};
     Kernel::KThread* owner{};
+
+    Core::System& system;
 };
 
 class WaitTreeCallstack : public WaitTreeExpandableItem {
     Q_OBJECT
 public:
-    explicit WaitTreeCallstack(const Kernel::KThread& thread);
+    explicit WaitTreeCallstack(const Kernel::KThread& thread, Core::System& system_);
     ~WaitTreeCallstack() override;
 
     QString GetText() const override;
@@ -99,27 +106,34 @@ public:
 
 private:
     const Kernel::KThread& thread;
+
+    Core::System& system;
 };
 
 class WaitTreeSynchronizationObject : public WaitTreeExpandableItem {
     Q_OBJECT
 public:
-    explicit WaitTreeSynchronizationObject(const Kernel::KSynchronizationObject& object);
+    explicit WaitTreeSynchronizationObject(const Kernel::KSynchronizationObject& object,
+                                           Core::System& system_);
     ~WaitTreeSynchronizationObject() override;
 
     static std::unique_ptr<WaitTreeSynchronizationObject> make(
-        const Kernel::KSynchronizationObject& object);
+        const Kernel::KSynchronizationObject& object, Core::System& system);
     QString GetText() const override;
     std::vector<std::unique_ptr<WaitTreeItem>> GetChildren() const override;
 
 protected:
     const Kernel::KSynchronizationObject& object;
+
+private:
+    Core::System& system;
 };
 
 class WaitTreeObjectList : public WaitTreeExpandableItem {
     Q_OBJECT
 public:
-    WaitTreeObjectList(const std::vector<Kernel::KSynchronizationObject*>& list, bool wait_all);
+    WaitTreeObjectList(const std::vector<Kernel::KSynchronizationObject*>& list, bool wait_all,
+                       Core::System& system_);
     ~WaitTreeObjectList() override;
 
     QString GetText() const override;
@@ -128,30 +142,35 @@ public:
 private:
     const std::vector<Kernel::KSynchronizationObject*>& object_list;
     bool wait_all;
+
+    Core::System& system;
 };
 
 class WaitTreeThread : public WaitTreeSynchronizationObject {
     Q_OBJECT
 public:
-    explicit WaitTreeThread(const Kernel::KThread& thread);
+    explicit WaitTreeThread(const Kernel::KThread& thread, Core::System& system_);
     ~WaitTreeThread() override;
 
     QString GetText() const override;
     QColor GetColor() const override;
     std::vector<std::unique_ptr<WaitTreeItem>> GetChildren() const override;
+
+private:
+    Core::System& system;
 };
 
 class WaitTreeEvent : public WaitTreeSynchronizationObject {
     Q_OBJECT
 public:
-    explicit WaitTreeEvent(const Kernel::KReadableEvent& object);
+    explicit WaitTreeEvent(const Kernel::KReadableEvent& object, Core::System& system_);
     ~WaitTreeEvent() override;
 };
 
 class WaitTreeThreadList : public WaitTreeExpandableItem {
     Q_OBJECT
 public:
-    explicit WaitTreeThreadList(std::vector<Kernel::KThread*>&& list);
+    explicit WaitTreeThreadList(std::vector<Kernel::KThread*>&& list, Core::System& system_);
     ~WaitTreeThreadList() override;
 
     QString GetText() const override;
@@ -159,13 +178,15 @@ public:
 
 private:
     std::vector<Kernel::KThread*> thread_list;
+
+    Core::System& system;
 };
 
 class WaitTreeModel : public QAbstractItemModel {
     Q_OBJECT
 
 public:
-    explicit WaitTreeModel(QObject* parent = nullptr);
+    explicit WaitTreeModel(Core::System& system_, QObject* parent = nullptr);
     ~WaitTreeModel() override;
 
     QVariant data(const QModelIndex& index, int role) const override;
@@ -179,13 +200,15 @@ public:
 
 private:
     std::vector<std::unique_ptr<WaitTreeThread>> thread_items;
+
+    Core::System& system;
 };
 
 class WaitTreeWidget : public QDockWidget {
     Q_OBJECT
 
 public:
-    explicit WaitTreeWidget(QWidget* parent = nullptr);
+    explicit WaitTreeWidget(Core::System& system_, QWidget* parent = nullptr);
     ~WaitTreeWidget() override;
 
 public slots:
@@ -198,4 +221,6 @@ public slots:
 private:
     QTreeView* view;
     WaitTreeModel* model;
+
+    Core::System& system;
 };

src/yuzu/discord_impl.cpp

@@ -13,7 +13,7 @@
 
 namespace DiscordRPC {
 
-DiscordImpl::DiscordImpl() {
+DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} {
     DiscordEventHandlers handlers{};
 
     // The number is the client ID for yuzu, it's used for images and the
@@ -35,12 +35,13 @@ void DiscordImpl::Update() {
                          std::chrono::system_clock::now().time_since_epoch())
                          .count();
     std::string title;
-    if (Core::System::GetInstance().IsPoweredOn())
-        Core::System::GetInstance().GetAppLoader().ReadTitle(title);
+    if (system.IsPoweredOn()) {
+        system.GetAppLoader().ReadTitle(title);
+    }
     DiscordRichPresence presence{};
     presence.largeImageKey = "yuzu_logo";
     presence.largeImageText = "yuzu is an emulator for the Nintendo Switch";
-    if (Core::System::GetInstance().IsPoweredOn()) {
+    if (system.IsPoweredOn()) {
         presence.state = title.c_str();
         presence.details = "Currently in game";
     } else {

src/yuzu/discord_impl.h

@@ -6,15 +6,21 @@
 
 #include "yuzu/discord.h"
 
+namespace Core {
+class System;
+}
+
 namespace DiscordRPC {
 
 class DiscordImpl : public DiscordInterface {
 public:
-    DiscordImpl();
+    DiscordImpl(Core::System& system_);
     ~DiscordImpl() override;
 
     void Pause() override;
     void Update() override;
+
+    Core::System& system;
 };
 
 } // namespace DiscordRPC

src/yuzu/game_list.cpp

@@ -159,8 +159,7 @@ GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} {
  * @return true if the haystack contains all words of userinput
  */
 static bool ContainsAllWords(const QString& haystack, const QString& userinput) {
-    const QStringList userinput_split =
-        userinput.split(QLatin1Char{' '}, QString::SplitBehavior::SkipEmptyParts);
+    const QStringList userinput_split = userinput.split(QLatin1Char{' '}, Qt::SkipEmptyParts);
 
     return std::all_of(userinput_split.begin(), userinput_split.end(),
                        [&haystack](const QString& s) { return haystack.contains(s); });
@@ -305,8 +304,8 @@ void GameList::OnFilterCloseClicked() {
 }
 
 GameList::GameList(FileSys::VirtualFilesystem vfs, FileSys::ManualContentProvider* provider,
-                   GMainWindow* parent)
-    : QWidget{parent}, vfs(std::move(vfs)), provider(provider) {
+                   Core::System& system_, GMainWindow* parent)
+    : QWidget{parent}, vfs(std::move(vfs)), provider(provider), system{system_} {
     watcher = new QFileSystemWatcher(this);
     connect(watcher, &QFileSystemWatcher::directoryChanged, this, &GameList::RefreshGameDirectory);
 
@@ -738,7 +737,8 @@ void GameList::PopulateAsync(QVector<UISettings::GameDir>& game_dirs) {
 
     emit ShouldCancelWorker();
 
-    GameListWorker* worker = new GameListWorker(vfs, provider, game_dirs, compatibility_list);
+    GameListWorker* worker =
+        new GameListWorker(vfs, provider, game_dirs, compatibility_list, system);
 
     connect(worker, &GameListWorker::EntryReady, this, &GameList::AddEntry, Qt::QueuedConnection);
     connect(worker, &GameListWorker::DirEntryReady, this, &GameList::AddDirEntry,

src/yuzu/game_list.h

@@ -72,7 +72,8 @@ public:
     };
 
     explicit GameList(std::shared_ptr<FileSys::VfsFilesystem> vfs,
-                      FileSys::ManualContentProvider* provider, GMainWindow* parent = nullptr);
+                      FileSys::ManualContentProvider* provider, Core::System& system_,
+                      GMainWindow* parent = nullptr);
     ~GameList() override;
 
     QString GetLastFilterResultItem() const;
@@ -145,6 +146,8 @@ private:
     CompatibilityList compatibility_list;
 
     friend class GameListSearchField;
+
+    Core::System& system;
 };
 
 class GameListPlaceholder : public QWidget {

src/yuzu/game_list_worker.cpp

@@ -228,16 +228,15 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri
 GameListWorker::GameListWorker(FileSys::VirtualFilesystem vfs,
                                FileSys::ManualContentProvider* provider,
                                QVector<UISettings::GameDir>& game_dirs,
-                               const CompatibilityList& compatibility_list)
+                               const CompatibilityList& compatibility_list, Core::System& system_)
     : vfs(std::move(vfs)), provider(provider), game_dirs(game_dirs),
-      compatibility_list(compatibility_list) {}
+      compatibility_list(compatibility_list), system{system_} {}
 
 GameListWorker::~GameListWorker() = default;
 
 void GameListWorker::AddTitlesToGameList(GameListDir* parent_dir) {
     using namespace FileSys;
 
-    auto& system = Core::System::GetInstance();
     const auto& cache = dynamic_cast<ContentProviderUnion&>(system.GetContentProvider());
 
     auto installed_games = cache.ListEntriesFilterOrigin(std::nullopt, TitleType::Application,
@@ -285,10 +284,7 @@ void GameListWorker::AddTitlesToGameList(GameListDir* parent_dir) {
 
 void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_path, bool deep_scan,
                                     GameListDir* parent_dir) {
-    auto& system = Core::System::GetInstance();
-
-    const auto callback = [this, target, parent_dir,
-                           &system](const std::filesystem::path& path) -> bool {
+    const auto callback = [this, target, parent_dir](const std::filesystem::path& path) -> bool {
         if (stop_processing) {
             // Breaks the callback loop.
             return false;