diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-08-29 00:44:27 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-08-29 00:58:11 -0400 |
| commit | bcd3c79eca66c911cf5eb9c593b63ab60e46d783 (patch) | |
| tree | 2ee39ab0bdbaaae69bf82ce725cf06fb77cea171 /src/yuzu/bootmanager.cpp | |
| parent | 57d9ef5a899dd32be7bae5aaeb53bc7cd2766a78 (diff) | |
yuzu/main: Amend lifetime issues with InputSubsystem
Due to the way Qt performs destruction of parent/child widgets, we need
to make the lifetime of the input subsystem shared across the main
window and the render window.
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 f1b428bde..32b548c56 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), |