mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 21:03:23 +02:00
yuzu: Move disable_web_applet to UISettings
This commit is contained in:
parent
f55af65e82
commit
1cbe23ed7b
@ -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);
|
||||
}
|
||||
});
|
||||
|
@ -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;
|
||||
|
||||
|
@ -114,6 +114,7 @@ struct Values {
|
||||
|
||||
bool configuration_applied;
|
||||
bool reset_to_defaults;
|
||||
bool disable_web_applet{};
|
||||
};
|
||||
|
||||
extern Values values;
|
||||
|
Loading…
Reference in New Issue
Block a user