diff options
| author |  Fernando S | 2021-10-16 01:48:10 +0200 |
|---|---|---|
| committer |  GitHub | 2021-10-16 01:48:10 +0200 |
| commit | 8b996015a88f954535cc8024196aec0fd4b0bc7b (patch) | |
| tree | 7b6370af5df3949cac9ab8e63b75bac4d0b0c97d /src | |
| parent | Merge pull request #7187 from FernandoS27/boy-i-say-boy (diff) | |
| parent | main: Add missing make_unique for ui (diff) | |
| download | yuzu-8b996015a88f954535cc8024196aec0fd4b0bc7b.tar.gz yuzu-8b996015a88f954535cc8024196aec0fd4b0bc7b.tar.xz yuzu-8b996015a88f954535cc8024196aec0fd4b0bc7b.zip | |
Merge pull request #7190 from Morph1984/missing-ui-main
main: Add missing make_unique for ui
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 3155a5c19..fdcd423d7 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -192,7 +192,7 @@ static void RemoveCachedContents() { | |||
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | GMainWindow::GMainWindow() | 194 | GMainWindow::GMainWindow() |
| 195 | : system{std::make_unique<Core::System>()}, | 195 | : ui{std::make_unique<Ui::MainWindow>()}, system{std::make_unique<Core::System>()}, |
| 196 | input_subsystem{std::make_shared<InputCommon::InputSubsystem>()}, | 196 | input_subsystem{std::make_shared<InputCommon::InputSubsystem>()}, |
| 197 | config{std::make_unique<Config>(*system)}, | 197 | config{std::make_unique<Config>(*system)}, |
| 198 | vfs{std::make_shared<FileSys::RealVfsFilesystem>()}, | 198 | vfs{std::make_shared<FileSys::RealVfsFilesystem>()}, |