diff options
| author |  Zach Hilman | 2019-06-05 12:14:24 -0400 |
|---|---|---|
| committer | Zach Hilman | 2019-06-24 20:05:11 -0400 |
| commit | b889167b2cb2613ed05b2edc8d2cf547ac24d500 (patch) | |
| tree | ac8c8ae0a87ff82f6c9df9fb95b192ecee6de73e /src | |
| parent | applets: Track ECommerce and Parental Control applet frontends (diff) | |
| download | yuzu-b889167b2cb2613ed05b2edc8d2cf547ac24d500.tar.gz yuzu-b889167b2cb2613ed05b2edc8d2cf547ac24d500.tar.xz yuzu-b889167b2cb2613ed05b2edc8d2cf547ac24d500.zip | |
yuzu: Accept default applets for Parental Controls and ECommerce
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 66a7080c9..d1813e834 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -814,11 +814,13 @@ bool GMainWindow::LoadROM(const QString& filename) { | |||
| 814 | system.SetGPUDebugContext(debug_context); | 814 | system.SetGPUDebugContext(debug_context); |
| 815 | 815 | ||
| 816 | system.SetAppletFrontendSet({ | 816 | system.SetAppletFrontendSet({ |
| 817 | std::make_unique<QtErrorDisplay>(*this), | 817 | nullptr, ///< Parental Controls |
| 818 | nullptr, | 818 | std::make_unique<QtErrorDisplay>(*this), ///< |
| 819 | std::make_unique<QtProfileSelector>(*this), | 819 | nullptr, ///< Photo Viewer |
| 820 | std::make_unique<QtSoftwareKeyboard>(*this), | 820 | std::make_unique<QtProfileSelector>(*this), ///< |
| 821 | std::make_unique<QtWebBrowser>(*this), | 821 | std::make_unique<QtSoftwareKeyboard>(*this), ///< |
| 822 | std::make_unique<QtWebBrowser>(*this), ///< | ||
| 823 | nullptr, ///< E-Commerce | ||
| 822 | }); | 824 | }); |
| 823 | 825 | ||
| 824 | const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())}; | 826 | const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())}; |