summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-03-12 00:39:48 +0100
committerZach Hilman <zachhilman@gmail.com>2019-04-17 17:35:24 +0200
commita04d36c5a407ba3d182cbc8ee9695bc39f46ca4f (patch)
tree0c2f95ccd3c3ee4ffd8783718554742823493f5e
parentqt: Add dialog implementation of Error applet (diff)
downloadyuzu-a04d36c5a407ba3d182cbc8ee9695bc39f46ca4f.tar
yuzu-a04d36c5a407ba3d182cbc8ee9695bc39f46ca4f.tar.gz
yuzu-a04d36c5a407ba3d182cbc8ee9695bc39f46ca4f.tar.bz2
yuzu-a04d36c5a407ba3d182cbc8ee9695bc39f46ca4f.tar.lz
yuzu-a04d36c5a407ba3d182cbc8ee9695bc39f46ca4f.tar.xz
yuzu-a04d36c5a407ba3d182cbc8ee9695bc39f46ca4f.tar.zst
yuzu-a04d36c5a407ba3d182cbc8ee9695bc39f46ca4f.zip
-rw-r--r--src/yuzu/main.cpp12
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 @@
#include <thread>
// VFS includes must be before glad as they will conflict with Windows file api, which uses defines.
+#include "applets/error.h"
#include "applets/profile_select.h"
#include "applets/software_keyboard.h"
#include "applets/web_browser.h"
@@ -15,6 +16,7 @@
#include "configuration/configure_per_general.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_real.h"
+#include "core/frontend/applets/general_frontend.h"
#include "core/frontend/scope_acquire_window_context.h"
#include "core/hle/service/acc/profile_manager.h"
#include "core/hle/service/am/applets/applets.h"
@@ -795,9 +797,13 @@ bool GMainWindow::LoadROM(const QString& filename) {
system.SetGPUDebugContext(debug_context);
- system.SetProfileSelector(std::make_unique<QtProfileSelector>(*this));
- system.SetSoftwareKeyboard(std::make_unique<QtSoftwareKeyboard>(*this));
- system.SetWebBrowser(std::make_unique<QtWebBrowser>(*this));
+ system.SetAppletFrontendSet({
+ std::make_unique<QtErrorDisplay>(*this),
+ nullptr,
+ std::make_unique<QtProfileSelector>(*this),
+ std::make_unique<QtSoftwareKeyboard>(*this),
+ std::make_unique<QtWebBrowser>(*this),
+ });
const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())};