mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-05 18:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash using deleted concurrent queue of event when Alleg4Display() is being destroyed

Browse Source
This commit is contained in:
David Capello 2014-05-03 18:02:27 -03:00
parent 6774ec89f9
commit 774a36efc9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/she/she_alleg4.cpp
View File

@ -179,6 +179,7 @@ private:
namespace {
base::mutex unique_display_mutex;
Display* unique_display = NULL;
int display_scale;
@ -189,7 +190,9 @@ bool display_has_mouse = false;
static void queue_event(Event& ev)
{
static_cast<Alleg4EventQueue*>(unique_display->getEventQueue())->queueEvent(ev);
base::scoped_lock hold(unique_display_mutex);
if (unique_display)
static_cast<Alleg4EventQueue*>(unique_display->getEventQueue())->queueEvent(ev);
}
static LRESULT CALLBACK wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
@ -452,16 +455,21 @@ public:
}
~Alleg4Display() {
delete m_queue;
// Put "unique_display" to null so queue_event() doesn't use
// "m_queue" anymore.
{
base::scoped_lock hold(unique_display_mutex);
unique_display = NULL;
}
#if WIN32
unsubclass_hwnd((HWND)nativeHandle());
#endif
delete m_queue;
m_surface->dispose();
set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
unique_display = NULL;
}
void dispose() OVERRIDE {