From 1cbe23ed7b0d527a4ae2595ee7810a5c4579ed0a Mon Sep 17 00:00:00 2001 From: lat9nq Date: Thu, 17 Mar 2022 16:55:30 -0400 Subject: yuzu: Move disable_web_applet to UISettings --- src/yuzu/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/yuzu/main.cpp') 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); } }); -- cgit v1.2.3 From 7760777c06ba227eba2f985765e07d8f4829a8c6 Mon Sep 17 00:00:00 2001 From: lat9nq Date: Thu, 17 Mar 2022 18:14:27 -0400 Subject: main: Update Disable Web Applet warning --- src/yuzu/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/yuzu/main.cpp') diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index a3ec822a6..b137d5e38 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -652,9 +652,8 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, connect(exit_action, &QAction::triggered, this, [this, &web_browser_view] { const auto result = QMessageBox::warning( this, tr("Disable Web Applet"), - tr("Disabling the web applet will cause it to not be shown again for the rest of the " - "emulated session. This 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?"), + 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?"), QMessageBox::Yes | QMessageBox::No); if (result == QMessageBox::Yes) { UISettings::values.disable_web_applet = true; -- cgit v1.2.3 From db637b5a4c02772eb827ed01a6ecb430e4b65daa Mon Sep 17 00:00:00 2001 From: lat9nq Date: Thu, 17 Mar 2022 19:20:15 -0400 Subject: yuzu qt: Save disable_web_applet setting The web applet causes multiple issues with the rest of the application. Disable it by default and add a debug option to re-enable it until a proper solution can be found. --- src/yuzu/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/yuzu/main.cpp') 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; -- cgit v1.2.3