diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-11-10 02:38:11 +0100 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-18 16:53:47 +0100 |
commit | a81645400f9ba40b272163ef6f751ba3428b85a1 (patch) | |
tree | d552327edfbcd8a37321a0cfb2520c37c7cd4869 /src/yuzu/main.cpp | |
parent | am: Construct and use proper applets with ILibraryAppletAccessor (diff) | |
download | yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.gz yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.bz2 yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.lz yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.xz yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.tar.zst yuzu-a81645400f9ba40b272163ef6f751ba3428b85a1.zip |
Diffstat (limited to '')
-rw-r--r-- | src/yuzu/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 999086e7f..7b2a01169 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -8,9 +8,11 @@ #include <thread> // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. +#include "applets/software_keyboard.h" #include "core/file_sys/vfs.h" #include "core/file_sys/vfs_real.h" #include "core/hle/service/acc/profile_manager.h" +#include "core/hle/service/am/applets/applets.h" // These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows // defines. @@ -559,6 +561,8 @@ bool GMainWindow::LoadROM(const QString& filename) { system.SetGPUDebugContext(debug_context); + Service::AM::Applets::RegisterSoftwareKeyboard(std::make_shared<QtSoftwareKeyboard>(*this)); + const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())}; const auto drd_callout = |