diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/main.h | 3 | ||||
| -rw-r--r-- | src/yuzu/uisettings.h | 1 |
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, | |||
| 587 | #ifdef YUZU_USE_QT_WEB_ENGINE | 587 | #ifdef YUZU_USE_QT_WEB_ENGINE |
| 588 | 588 | ||
| 589 | // Raw input breaks with the web applet, Disable web applets if enabled | 589 | // Raw input breaks with the web applet, Disable web applets if enabled |
| 590 | if (disable_web_applet || Settings::values.enable_raw_input) { | 590 | if (UISettings::values.disable_web_applet || Settings::values.enable_raw_input) { |
| 591 | emit WebBrowserClosed(Service::AM::Applets::WebExitReason::WindowClosed, | 591 | emit WebBrowserClosed(Service::AM::Applets::WebExitReason::WindowClosed, |
| 592 | "http://localhost/"); | 592 | "http://localhost/"); |
| 593 | return; | 593 | return; |
| @@ -657,7 +657,7 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, | |||
| 657 | "Super Mario 3D All-Stars. Are you sure you want to disable the web applet?"), | 657 | "Super Mario 3D All-Stars. Are you sure you want to disable the web applet?"), |
| 658 | QMessageBox::Yes | QMessageBox::No); | 658 | QMessageBox::Yes | QMessageBox::No); |
| 659 | if (result == QMessageBox::Yes) { | 659 | if (result == QMessageBox::Yes) { |
| 660 | disable_web_applet = true; | 660 | UISettings::values.disable_web_applet = true; |
| 661 | web_browser_view.SetFinished(true); | 661 | web_browser_view.SetFinished(true); |
| 662 | } | 662 | } |
| 663 | }); | 663 | }); |
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: | |||
| 400 | // Last game booted, used for multi-process apps | 400 | // Last game booted, used for multi-process apps |
| 401 | QString last_filename_booted; | 401 | QString last_filename_booted; |
| 402 | 402 | ||
| 403 | // Disables the web applet for the rest of the emulated session | ||
| 404 | bool disable_web_applet{}; | ||
| 405 | |||
| 406 | // Applets | 403 | // Applets |
| 407 | QtSoftwareKeyboardDialog* software_keyboard = nullptr; | 404 | QtSoftwareKeyboardDialog* software_keyboard = nullptr; |
| 408 | 405 | ||
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 { | |||
| 114 | 114 | ||
| 115 | bool configuration_applied; | 115 | bool configuration_applied; |
| 116 | bool reset_to_defaults; | 116 | bool reset_to_defaults; |
| 117 | bool disable_web_applet{}; | ||
| 117 | }; | 118 | }; |
| 118 | 119 | ||
| 119 | extern Values values; | 120 | extern Values values; |