diff options
| author | lat9nq <lat9nq@gmail.com> | 2022-03-07 03:37:54 -0500 |
|---|---|---|
| committer | lat9nq <lat9nq@gmail.com> | 2022-03-07 18:21:56 -0500 |
| commit | b5e60ae1b0568d6c9e47134dd2bda70906a2dad9 (patch) | |
| tree | 93c23176ccbc92e7340262a7279edbe2f3888d1c /src | |
| parent | 1f24a4e520004d48799a27b159432aa0b8634628 (diff) | |
video_core: Cancel Scoped's exit call on GPU failure
When CreateRenderer fails, the GraphicsContext that was std::move'd into
it is destroyed before the Scoped that was created to manage its
currency. In that case, the GraphicsContext::Scoped will still call its
destructor at the ending of the function. And because the context is
destroyed, the Scoped will cause a crash as it attempts to call a
destroyed object's DoneCurrent function.
Since we know when the call would be invalid, call the Scoped's Cancel
method. This prevents it from calling a method on a destroyed object.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/video_core.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index 329bf4defd..2f25945858 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -50,6 +50,7 @@ std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Cor gpu->BindRenderer(std::move(renderer)); return gpu; } catch (const std::runtime_error& exception) { + scope.Cancel(); LOG_ERROR(HW_GPU, "Failed to initialize GPU: {}", exception.what()); return nullptr; } |