From 39b1842335c8ed949b776993686fb27f090655e5 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 10 Jul 2018 12:31:27 +0200 Subject: Fix T55882: crash closing user preferences window in some cases. --- source/blender/windowmanager/intern/wm_window.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 4f86d05d515..fcd74f32bde 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -182,11 +182,11 @@ static void wm_window_check_position(rcti *rect) static void wm_ghostwindow_destroy(wmWindowManager *wm, wmWindow *win) { if (win->ghostwin) { - if (win == wm->windrawable) { - /* Prevents non-drawable state of main windows (bugs #22967, - * #25071 and possibly #22477 too). */ - wm_window_clear_drawable(wm); - } + /* Prevents non-drawable state of main windows (bugs #22967, + * #25071 and possibly #22477 too). Always clear it even if + * this window was not the drawable one, because we mess with + * drawing context to discard the GW context. */ + wm_window_clear_drawable(wm); if (win == wm->winactive) { wm->winactive = NULL; -- cgit v1.2.3