diff options
| author | LC <mathew1800@gmail.com> | 2020-08-29 01:33:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-29 01:33:29 -0400 |
| commit | ce43139eb7f347c853713699dfe05a500dc7f240 (patch) | |
| tree | e33c12c1ea8408dce12de19ca141149472fb92c9 /src/yuzu/main.cpp | |
| parent | 01de4fa26a19095c059862ee047aec34603fdd77 (diff) | |
| parent | bcd3c79eca66c911cf5eb9c593b63ab60e46d783 (diff) | |
Merge pull request #4604 from lioncash/lifetime
yuzu/main: Amend lifetime issues with InputSubsystem
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index cab9d680a..a1b61d119 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -187,7 +187,7 @@ static void InitializeLogging() { } GMainWindow::GMainWindow() - : input_subsystem{std::make_unique<InputCommon::InputSubsystem>()}, + : input_subsystem{std::make_shared<InputCommon::InputSubsystem>()}, config{std::make_unique<Config>()}, vfs{std::make_shared<FileSys::RealVfsFilesystem>()}, provider{std::make_unique<FileSys::ManualContentProvider>()} { InitializeLogging(); @@ -474,7 +474,7 @@ void GMainWindow::InitializeWidgets() { #ifdef YUZU_ENABLE_COMPATIBILITY_REPORTING ui.action_Report_Compatibility->setVisible(true); #endif - render_window = new GRenderWindow(this, emu_thread.get(), input_subsystem.get()); + render_window = new GRenderWindow(this, emu_thread.get(), input_subsystem); render_window->hide(); game_list = new GameList(vfs, provider.get(), this); |