From 054552a30ba7a720e4977465048ced924a1f84e4 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 7 May 2008 21:45:27 +0000 Subject: [PATCH] (svn r12999) -Fix [FS#1995]: when a Window got deleted on a double click event, we should not send a click event to the now non-existant Window as that causes segfaults. --- src/window.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/window.cpp b/src/window.cpp index 023b47fb4d..e214d94e18 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1931,9 +1931,14 @@ void MouseLoop(MouseClick click, int mousewheel) } } else { switch (click) { - case MC_DOUBLE_LEFT: DispatchLeftClickEvent(w, x - w->left, y - w->top, true); - /* fallthough, and also give a single-click for backwards compatible */ - case MC_LEFT: DispatchLeftClickEvent(w, x - w->left, y - w->top, false); break; + case MC_DOUBLE_LEFT: + DispatchLeftClickEvent(w, x - w->left, y - w->top, true); + if (_mouseover_last_w == NULL) break; // The window got removed. + /* fallthough, and also give a single-click for backwards compatibility */ + case MC_LEFT: + DispatchLeftClickEvent(w, x - w->left, y - w->top, false); + break; + default: if (!scrollwheel_scrolling || w == NULL || w->window_class != WC_SMALLMAP) break; /* We try to use the scrollwheel to scroll since we didn't touch any of the buttons.