From 1eae8d0a95d58524aedbc31dacf00dd32e4e3498 Mon Sep 17 00:00:00 2001 From: elexis Date: Mon, 15 May 2017 11:51:01 +0000 Subject: [PATCH] Fix doubleclicking if the unit died between the clicks following 8f36ca47a1, refs #4414, https://code.wildfiregames.com/D326 Differential Revision: https://code.wildfiregames.com/D469 Patch By: causative This was SVN commit r19583. --- binaries/data/mods/public/gui/session/input.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/binaries/data/mods/public/gui/session/input.js b/binaries/data/mods/public/gui/session/input.js index 34bd06f36f..4e1dedd928 100644 --- a/binaries/data/mods/public/gui/session/input.js +++ b/binaries/data/mods/public/gui/session/input.js @@ -968,8 +968,10 @@ function handleInputAfterGui(ev) { if (clickedEntity == INVALID_ENTITY) clickedEntity = Engine.PickEntityAtPoint(ev.x, ev.y); - if (clickedEntity == INVALID_ENTITY) + // Abort if we didn't click on an entity or if the entity was removed before the mousebuttonup event. + if (clickedEntity == INVALID_ENTITY || !GetEntityState(clickedEntity)) { + clickedEntity = INVALID_ENTITY; if (!Engine.HotkeyIsPressed("selection.add") && !Engine.HotkeyIsPressed("selection.remove")) { g_Selection.reset();