diff options
author | lat9nq <lat9nq@gmail.com> | 2022-03-07 03:35:34 -0500 |
---|---|---|
committer | lat9nq <lat9nq@gmail.com> | 2022-03-07 18:21:56 -0500 |
commit | 1f24a4e520004d48799a27b159432aa0b8634628 (patch) | |
tree | 05162b2eef91dca47877097c2eaf440fb804bd11 | |
parent | 381f1dd2c993847fdef65b2c9da4c7ec29079553 (diff) |
emu_window: Create a way to Cancel the exit of a Scoped
If a GraphicsContext is destroyed before its Scoped is destroyed, this
causes a crash as the Scoped tries to call a method in the destroyed
context on exit.
Add a way to Cancel the call when we know that calling the
GraphicsContext will not work.
-rw-r--r-- | src/core/frontend/emu_window.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index e413a520a..b3bffecb2 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h @@ -42,11 +42,20 @@ public: context.MakeCurrent(); } ~Scoped() { - context.DoneCurrent(); + if (active) { + context.DoneCurrent(); + } + } + + /// In the event that context was destroyed before the Scoped is destroyed, this provides a + /// mechanism to prevent calling a destroyed object's method during the deconstructor + void Cancel() { + active = false; } private: GraphicsContext& context; + bool active{true}; }; /// Calls MakeCurrent on the context and calls DoneCurrent when the scope for the returned value |