summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/arm/nce/patcher.cpp2
-rw-r--r--src/yuzu/configuration/qt_config.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/arm/nce/patcher.cpp b/src/core/arm/nce/patcher.cpp
index f97b909df..47a7a8880 100644
--- a/src/core/arm/nce/patcher.cpp
+++ b/src/core/arm/nce/patcher.cpp
@@ -28,6 +28,8 @@ Patcher::~Patcher() = default;
void Patcher::PatchText(const Kernel::PhysicalMemory& program_image,
const Kernel::CodeSet::Segment& code) {
+ // Branch to the first instruction of the module.
+ this->BranchToModule(0);
// Write save context helper function.
c.l(m_save_context);
diff --git a/src/yuzu/configuration/qt_config.cpp b/src/yuzu/configuration/qt_config.cpp
index 5a8e69aa9..636c5e640 100644
--- a/src/yuzu/configuration/qt_config.cpp
+++ b/src/yuzu/configuration/qt_config.cpp
@@ -225,7 +225,8 @@ void QtConfig::ReadPathValues() {
UISettings::values.recent_files =
QString::fromStdString(ReadStringSetting(std::string("recentFiles")))
.split(QStringLiteral(", "), Qt::SkipEmptyParts, Qt::CaseSensitive);
- UISettings::values.language = ReadStringSetting(std::string("language"), std::string(""));
+ UISettings::values.language =
+ ReadStringSetting(std::string("language"), std::make_optional(std::string("")));
EndGroup();
}