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 | 437bc3c1993684cf618da99eccf8480bf99e509b (patch) | |
| tree | e33c12c1ea8408dce12de19ca141149472fb92c9 /src/yuzu/bootmanager.cpp | |
| parent | 2275de452ba235a85e3f5b66045516657630f9ce (diff) | |
| parent | 752b626714723c1b17fc1311ffd4656e3c62ec20 (diff) | |
Merge pull request #4604 from lioncash/lifetime
yuzu/main: Amend lifetime issues with InputSubsystem
Diffstat (limited to 'src/yuzu/bootmanager.cpp')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index f1b428bdee..32b548c56b 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -305,8 +305,8 @@ static Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* } GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_, - InputCommon::InputSubsystem* input_subsystem_) - : QWidget(parent), emu_thread(emu_thread_), input_subsystem{input_subsystem_} { + std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_) + : QWidget(parent), emu_thread(emu_thread_), input_subsystem{std::move(input_subsystem_)} { setWindowTitle(QStringLiteral("yuzu %1 | %2-%3") .arg(QString::fromUtf8(Common::g_build_name), QString::fromUtf8(Common::g_scm_branch), |