diff options
| -rw-r--r-- | src/yuzu/main.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index bdee44b04..c73e78a23 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <thread> | 8 | #include <thread> |
| 9 | 9 | ||
| 10 | // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. | 10 | // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. |
| 11 | #include "applets/error.h" | ||
| 11 | #include "applets/profile_select.h" | 12 | #include "applets/profile_select.h" |
| 12 | #include "applets/software_keyboard.h" | 13 | #include "applets/software_keyboard.h" |
| 13 | #include "applets/web_browser.h" | 14 | #include "applets/web_browser.h" |
| @@ -15,6 +16,7 @@ | |||
| 15 | #include "configuration/configure_per_general.h" | 16 | #include "configuration/configure_per_general.h" |
| 16 | #include "core/file_sys/vfs.h" | 17 | #include "core/file_sys/vfs.h" |
| 17 | #include "core/file_sys/vfs_real.h" | 18 | #include "core/file_sys/vfs_real.h" |
| 19 | #include "core/frontend/applets/general_frontend.h" | ||
| 18 | #include "core/frontend/scope_acquire_window_context.h" | 20 | #include "core/frontend/scope_acquire_window_context.h" |
| 19 | #include "core/hle/service/acc/profile_manager.h" | 21 | #include "core/hle/service/acc/profile_manager.h" |
| 20 | #include "core/hle/service/am/applets/applets.h" | 22 | #include "core/hle/service/am/applets/applets.h" |
| @@ -795,9 +797,13 @@ bool GMainWindow::LoadROM(const QString& filename) { | |||
| 795 | 797 | ||
| 796 | system.SetGPUDebugContext(debug_context); | 798 | system.SetGPUDebugContext(debug_context); |
| 797 | 799 | ||
| 798 | system.SetProfileSelector(std::make_unique<QtProfileSelector>(*this)); | 800 | system.SetAppletFrontendSet({ |
| 799 | system.SetSoftwareKeyboard(std::make_unique<QtSoftwareKeyboard>(*this)); | 801 | std::make_unique<QtErrorDisplay>(*this), |
| 800 | system.SetWebBrowser(std::make_unique<QtWebBrowser>(*this)); | 802 | nullptr, |
| 803 | std::make_unique<QtProfileSelector>(*this), | ||
| 804 | std::make_unique<QtSoftwareKeyboard>(*this), | ||
| 805 | std::make_unique<QtWebBrowser>(*this), | ||
| 806 | }); | ||
| 801 | 807 | ||
| 802 | const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())}; | 808 | const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())}; |
| 803 | 809 | ||