summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlat9nq <lat9nq@gmail.com>2022-03-17 21:55:30 +0100
committerlat9nq <lat9nq@gmail.com>2022-03-17 21:55:30 +0100
commit1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a (patch)
tree6b9ab2774001e7ab1097f5057aa6f1955633aa43
parentMerge pull request #7964 from german77/miiii (diff)
downloadyuzu-1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a.tar
yuzu-1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a.tar.gz
yuzu-1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a.tar.bz2
yuzu-1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a.tar.lz
yuzu-1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a.tar.xz
yuzu-1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a.tar.zst
yuzu-1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a.zip
-rw-r--r--src/yuzu/main.cpp4
-rw-r--r--src/yuzu/main.h3
-rw-r--r--src/yuzu/uisettings.h1
3 files changed, 3 insertions, 5 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 06774768d..a3ec822a6 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -587,7 +587,7 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url,
#ifdef YUZU_USE_QT_WEB_ENGINE
// Raw input breaks with the web applet, Disable web applets if enabled
- if (disable_web_applet || Settings::values.enable_raw_input) {
+ if (UISettings::values.disable_web_applet || Settings::values.enable_raw_input) {
emit WebBrowserClosed(Service::AM::Applets::WebExitReason::WindowClosed,
"http://localhost/");
return;
@@ -657,7 +657,7 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url,
"Super Mario 3D All-Stars. Are you sure you want to disable the web applet?"),
QMessageBox::Yes | QMessageBox::No);
if (result == QMessageBox::Yes) {
- disable_web_applet = true;
+ UISettings::values.disable_web_applet = true;
web_browser_view.SetFinished(true);
}
});
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 6a35b9e3d..f8ff34557 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -400,9 +400,6 @@ private:
// Last game booted, used for multi-process apps
QString last_filename_booted;
- // Disables the web applet for the rest of the emulated session
- bool disable_web_applet{};
-
// Applets
QtSoftwareKeyboardDialog* software_keyboard = nullptr;
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 06e8b46da..c952843fe 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -114,6 +114,7 @@ struct Values {
bool configuration_applied;
bool reset_to_defaults;
+ bool disable_web_applet{};
};
extern Values values;