early-access version 3789
This commit is contained in:
@@ -727,8 +727,7 @@ void Config::ReadMultiplayerValues() {
|
||||
}
|
||||
|
||||
void Config::ReadNetworkValues() {
|
||||
qt_config->beginGroup(
|
||||
QString::fromUtf8(Settings::TranslateCategory(Settings::Category::Network)));
|
||||
qt_config->beginGroup(QString::fromStdString("Services"));
|
||||
|
||||
ReadCategory(Settings::Category::Network);
|
||||
|
||||
@@ -1271,9 +1270,11 @@ void Config::ReadSettingGeneric(Settings::BasicSetting* const setting) {
|
||||
}
|
||||
|
||||
if (global || !use_global) {
|
||||
const bool is_default = ReadSetting(name + QStringLiteral("/default"), true).value<bool>();
|
||||
const bool is_default =
|
||||
qt_config->value(name + QStringLiteral("/default"), true).value<bool>();
|
||||
if (!is_default) {
|
||||
setting->LoadString(ReadSetting(name, default_value).value<QString>().toStdString());
|
||||
setting->LoadString(
|
||||
qt_config->value(name, default_value).value<QString>().toStdString());
|
||||
} else {
|
||||
// Empty string resets the Setting to default
|
||||
setting->LoadString("");
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "yuzu/qt_common.h"
|
||||
|
||||
#include "common/dynamic_library.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "video_core/vulkan_common/vulkan_device.h"
|
||||
@@ -11,7 +14,6 @@
|
||||
#include "video_core/vulkan_common/vulkan_surface.h"
|
||||
#include "video_core/vulkan_common/vulkan_wrapper.h"
|
||||
#include "vulkan/vulkan_core.h"
|
||||
#include "yuzu/qt_common.h"
|
||||
#include "yuzu/vk_device_info.h"
|
||||
|
||||
class QWindow;
|
||||
|
||||
Reference in New Issue
Block a user