From bde243495607767b5370f69bcee2842952b3ad3a Mon Sep 17 00:00:00 2001 From: collecting Date: Wed, 22 Oct 2025 01:20:49 +0000 Subject: [PATCH 1/4] Fix savedata_factory.cpp --- src/core/file_sys/savedata_factory.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp index 174548621..b14b52c28 100644 --- a/src/core/file_sys/savedata_factory.cpp +++ b/src/core/file_sys/savedata_factory.cpp @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include @@ -247,7 +248,7 @@ Result SaveDataFactory::ReadSaveDataExtraData(SaveDataExtraData* out_extra_data, save_directory); // Return zeroed data - std::memset(out_extra_data, 0, sizeof(SaveDataExtraData)); + *out_extra_data = {}; // Or: *out_extra_data = SaveDataExtraData{}; out_extra_data->attr = attribute; return ResultSuccess; } From c3492232c1acda5160669a3cb700cad402631870 Mon Sep 17 00:00:00 2001 From: collecting Date: Wed, 22 Oct 2025 01:21:16 +0000 Subject: [PATCH 2/4] Fix patch_manager.cpp --- src/core/file_sys/patch_manager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 469cd91f9..924958882 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -179,7 +179,13 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const { } std::sort(patch_dirs.begin(), patch_dirs.end(), [](const VirtualDir& l, const VirtualDir& r) { - if(!l) return true; if(!r) return false; return l->GetName() < r->GetName(); + if (!l) { + return true; + } + if (!r) { + return false; + } + return l->GetName() < r->GetName(); }); std::vector layers; From bcbe8fddfcfde609cc87fd5c3dfd25011de402c1 Mon Sep 17 00:00:00 2001 From: collecting Date: Wed, 22 Oct 2025 01:21:51 +0000 Subject: [PATCH 3/4] Fix configure_per_game.h --- src/citron/configuration/configure_per_game.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/citron/configuration/configure_per_game.h b/src/citron/configuration/configure_per_game.h index c2dee1eb5..c71cdeef3 100644 --- a/src/citron/configuration/configure_per_game.h +++ b/src/citron/configuration/configure_per_game.h @@ -52,7 +52,7 @@ 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_, std::vector& vk_device_records, Core::System& system_); ~ConfigurePerGame() override; From ca8c822b9370bf57fc71aa0eb4616f82dca401c5 Mon Sep 17 00:00:00 2001 From: collecting Date: Wed, 22 Oct 2025 01:22:18 +0000 Subject: [PATCH 4/4] Fix configure_per_game.cpp --- src/citron/configuration/configure_per_game.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/citron/configuration/configure_per_game.cpp b/src/citron/configuration/configure_per_game.cpp index 4d0585d2c..6ee4fa204 100644 --- a/src/citron/configuration/configure_per_game.cpp +++ b/src/citron/configuration/configure_per_game.cpp @@ -61,7 +61,7 @@ #include "common/string_util.h" #include "common/xci_trimmer.h" -ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name, +ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name_, std::vector& vk_device_records, Core::System& system_) : QDialog(parent),