summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlat9nq <lat9nq@gmail.com>2022-03-18 00:20:15 +0100
committerlat9nq <lat9nq@gmail.com>2022-03-18 00:20:15 +0100
commitdb637b5a4c02772eb827ed01a6ecb430e4b65daa (patch)
treeaa8e65a9abe1e6dca038c5f2b1734df85b5f5058
parentmain: Update Disable Web Applet warning (diff)
downloadyuzu-db637b5a4c02772eb827ed01a6ecb430e4b65daa.tar
yuzu-db637b5a4c02772eb827ed01a6ecb430e4b65daa.tar.gz
yuzu-db637b5a4c02772eb827ed01a6ecb430e4b65daa.tar.bz2
yuzu-db637b5a4c02772eb827ed01a6ecb430e4b65daa.tar.lz
yuzu-db637b5a4c02772eb827ed01a6ecb430e4b65daa.tar.xz
yuzu-db637b5a4c02772eb827ed01a6ecb430e4b65daa.tar.zst
yuzu-db637b5a4c02772eb827ed01a6ecb430e4b65daa.zip
-rw-r--r--src/yuzu/configuration/config.cpp2
-rw-r--r--src/yuzu/configuration/configure_debug.cpp2
-rw-r--r--src/yuzu/main.cpp3
-rw-r--r--src/yuzu/uisettings.h2
4 files changed, 6 insertions, 3 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 4b943c6ba..d2e735f48 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -775,6 +775,7 @@ void Config::ReadUIValues() {
ReadBasicSetting(UISettings::values.pause_when_in_background);
ReadBasicSetting(UISettings::values.mute_when_in_background);
ReadBasicSetting(UISettings::values.hide_mouse);
+ ReadBasicSetting(UISettings::values.disable_web_applet);
qt_config->endGroup();
}
@@ -1308,6 +1309,7 @@ void Config::SaveUIValues() {
WriteBasicSetting(UISettings::values.pause_when_in_background);
WriteBasicSetting(UISettings::values.mute_when_in_background);
WriteBasicSetting(UISettings::values.hide_mouse);
+ WriteBasicSetting(UISettings::values.disable_web_applet);
qt_config->endGroup();
}
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp
index c2e6bf8d1..bd50f7a68 100644
--- a/src/yuzu/configuration/configure_debug.cpp
+++ b/src/yuzu/configuration/configure_debug.cpp
@@ -61,7 +61,7 @@ void ConfigureDebug::SetConfiguration() {
ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue());
#ifdef YUZU_USE_QT_WEB_ENGINE
- ui->disable_web_applet->setChecked(UISettings::values.disable_web_applet);
+ ui->disable_web_applet->setChecked(UISettings::values.disable_web_applet.GetValue());
#else
ui->disable_web_applet->setEnabled(false);
ui->disable_web_applet->setText(QString::fromUtf8("Web applet not compiled"));
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index b137d5e38..617c42734 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -653,7 +653,8 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url,
const auto result = QMessageBox::warning(
this, tr("Disable Web Applet"),
tr("Disabling the web applet can lead to undefined behavior and should only be used "
- "with Super Mario 3D All-Stars. Are you sure you want to disable the web applet?"),
+ "with Super Mario 3D All-Stars. Are you sure you want to disable the web "
+ "applet?\n(This can be re-enabled in the Debug settings.)"),
QMessageBox::Yes | QMessageBox::No);
if (result == QMessageBox::Yes) {
UISettings::values.disable_web_applet = true;
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index c952843fe..cc5aee382 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -114,7 +114,7 @@ struct Values {
bool configuration_applied;
bool reset_to_defaults;
- bool disable_web_applet{};
+ Settings::BasicSetting<bool> disable_web_applet{true, "disable_web_applet"};
};
extern Values values;