From 50439a58bd85302379365bfbb89178db5f6180a3 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 27 Oct 2020 18:50:33 +0100 Subject: [PATCH] source/Platform/Unix/X11Display.cpp: in destroy() make sure m_disp is valid before calling functions that needs it. --- source/Platform/Unix/X11Display.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/Platform/Unix/X11Display.cpp b/source/Platform/Unix/X11Display.cpp index 083546e..f2f5289 100644 --- a/source/Platform/Unix/X11Display.cpp +++ b/source/Platform/Unix/X11Display.cpp @@ -78,12 +78,13 @@ bool X11Display::create(DisplayDescription description) void X11Display::destroy() { - if (m_win) { - X11WindowEventHandler::unregisterHandler(m_disp, m_win); - ::XDestroyWindow(m_disp, m_win); - } - if (m_disp) { + + if (m_win) { + X11WindowEventHandler::unregisterHandler(m_disp, m_win); + ::XDestroyWindow(m_disp, m_win); + } + XReleaseDisplay(m_disp); m_disp = NULL; }