From 2358e6443d51867cefcc0a09937a44b30148600c Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Wed, 22 Nov 2023 06:18:45 +0100
Subject: [PATCH] early-access version 3987

---
 README.md                                |  2 +-
 src/frontend_common/config.cpp           | 29 +++++++++++++++++++++++-
 src/frontend_common/config.h             |  4 ++++
 src/yuzu/configuration/qt_config.cpp     |  3 ++-
 src/yuzu/configuration/shared_widget.cpp |  4 ++--
 src/yuzu/game_list_worker.cpp            |  2 +-
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2fd472ca1..356859708 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3986.
+This is the source code for early-access 3987.
 
 ## Legal Notice
 
diff --git a/src/frontend_common/config.cpp b/src/frontend_common/config.cpp
index 40a44ae12..a68a9cb4b 100755
--- a/src/frontend_common/config.cpp
+++ b/src/frontend_common/config.cpp
@@ -284,7 +284,7 @@ void Config::ReadDisabledAddOnValues() {
     const int size = BeginArray(std::string(""));
     for (int i = 0; i < size; ++i) {
         SetArrayIndex(i);
-        const auto title_id = ReadIntegerSetting(std::string("title_id"), 0);
+        const auto title_id = ReadUnsignedIntegerSetting(std::string("title_id"), 0);
         std::vector<std::string> out;
         const int d_size = BeginArray("disabled");
         for (int j = 0; j < d_size; ++j) {
@@ -664,6 +664,33 @@ s64 Config::ReadIntegerSetting(const std::string& key, const std::optional<s64>
     return result;
 }
 
+u64 Config::ReadUnsignedIntegerSetting(const std::string& key,
+                                       const std::optional<u64> default_value) {
+    std::string full_key = GetFullKey(key, false);
+    if (!default_value.has_value()) {
+        try {
+            return std::stoull(
+                std::string(config->GetValue(GetSection().c_str(), full_key.c_str(), "0")));
+        } catch (...) {
+            return 0;
+        }
+    }
+
+    u64 result = 0;
+    if (config->GetBoolValue(GetSection().c_str(),
+                             std::string(full_key).append("\\default").c_str(), true)) {
+        result = default_value.value();
+    } else {
+        try {
+            result = std::stoull(std::string(config->GetValue(
+                GetSection().c_str(), full_key.c_str(), ToString(default_value.value()).c_str())));
+        } catch (...) {
+            result = default_value.value();
+        }
+    }
+    return result;
+}
+
 double Config::ReadDoubleSetting(const std::string& key,
                                  const std::optional<double> default_value) {
     std::string full_key = GetFullKey(key, false);
diff --git a/src/frontend_common/config.h b/src/frontend_common/config.h
index f741aa8bb..20a1a8056 100755
--- a/src/frontend_common/config.h
+++ b/src/frontend_common/config.h
@@ -137,6 +137,8 @@ protected:
     bool ReadBooleanSetting(const std::string& key,
                             std::optional<bool> default_value = std::nullopt);
     s64 ReadIntegerSetting(const std::string& key, std::optional<s64> default_value = std::nullopt);
+    u64 ReadUnsignedIntegerSetting(const std::string& key,
+                                   std::optional<u64> default_value = std::nullopt);
     double ReadDoubleSetting(const std::string& key,
                              std::optional<double> default_value = std::nullopt);
     std::string ReadStringSetting(const std::string& key,
@@ -170,6 +172,8 @@ protected:
             return value_.has_value() ? std::to_string(*value_) : "none";
         } else if constexpr (std::is_same_v<T, bool>) {
             return value_ ? "true" : "false";
+        } else if constexpr (std::is_same_v<T, u64>) {
+            return std::to_string(static_cast<u64>(value_));
         } else {
             return std::to_string(static_cast<s64>(value_));
         }
diff --git a/src/yuzu/configuration/qt_config.cpp b/src/yuzu/configuration/qt_config.cpp
index 82402ec70..5a8e69aa9 100755
--- a/src/yuzu/configuration/qt_config.cpp
+++ b/src/yuzu/configuration/qt_config.cpp
@@ -283,7 +283,8 @@ void QtConfig::ReadUIGamelistValues() {
     const int favorites_size = BeginArray("favorites");
     for (int i = 0; i < favorites_size; i++) {
         SetArrayIndex(i);
-        UISettings::values.favorited_ids.append(ReadIntegerSetting(std::string("program_id")));
+        UISettings::values.favorited_ids.append(
+            ReadUnsignedIntegerSetting(std::string("program_id")));
     }
     EndArray();
 
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index ea8d7add4..941683a43 100755
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -194,7 +194,7 @@ QWidget* Widget::CreateRadioGroup(std::function<std::string()>& serializer,
         return group;
     }
 
-    const auto get_selected = [=]() -> int {
+    const auto get_selected = [this]() -> int {
         for (const auto& [id, button] : radio_buttons) {
             if (button->isChecked()) {
                 return id;
@@ -203,7 +203,7 @@ QWidget* Widget::CreateRadioGroup(std::function<std::string()>& serializer,
         return -1;
     };
 
-    const auto set_index = [=](u32 value) {
+    const auto set_index = [this](u32 value) {
         for (const auto& [id, button] : radio_buttons) {
             button->setChecked(id == value);
         }
diff --git a/src/yuzu/game_list_worker.cpp b/src/yuzu/game_list_worker.cpp
index ccd67a4c2..ef10f9992 100755
--- a/src/yuzu/game_list_worker.cpp
+++ b/src/yuzu/game_list_worker.cpp
@@ -479,6 +479,6 @@ void GameListWorker::run() {
         }
     }
 
-    RecordEvent([=](GameList* game_list) { game_list->DonePopulating(watch_list); });
+    RecordEvent([this](GameList* game_list) { game_list->DonePopulating(watch_list); });
     processing_completed.Set();
 }