forked from eden-emu/eden
[common] Better approach to enabling and disabling the Web Applet (#2729)
This implements a better approach to enabling and disabling the Web Applet, whether compiled or not. Reviewed-on: eden-emu/eden#2729 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Co-authored-by: MaranBr <maranbr@outlook.com> Co-committed-by: MaranBr <maranbr@outlook.com>
This commit is contained in:
parent
8ae7cfe96a
commit
053f4e95d4
5 changed files with 53 additions and 50 deletions
|
@ -934,7 +934,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 (UISettings::values.disable_web_applet || Settings::values.enable_raw_input) {
|
||||
if (Settings::values.disable_web_applet || Settings::values.enable_raw_input) {
|
||||
emit WebBrowserClosed(Service::AM::Frontend::WebExitReason::WindowClosed,
|
||||
"http://localhost/");
|
||||
return;
|
||||
|
@ -1007,7 +1007,7 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url,
|
|||
"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;
|
||||
Settings::values.disable_web_applet = true;
|
||||
web_applet->SetFinished(true);
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue