From c988b4d62ba08ee6a5efa44e0fa10da59dff4ae8 Mon Sep 17 00:00:00 2001
From: Patric Stout <truebrain@openttd.org>
Date: Thu, 7 Jan 2021 10:32:24 +0100
Subject: Fix #8332: aborting group drag&drop could cause crashes with vehicle
 drag&drop (#8511)

The selected group was not reset when drag&drop was aborted. When
after that vehicle drag&drop was successful, group drag&drop code
was still executed, causing weird behaviour or even crashes.
---
 src/group_gui.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 121008795..8ef6a2a1b 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -981,6 +981,7 @@ public:
 		/* abort drag & drop */
 		this->vehicle_sel = INVALID_VEHICLE;
 		this->DirtyHighlightedGroupWidget();
+		this->group_sel = INVALID_GROUP;
 		this->group_over = INVALID_GROUP;
 		this->SetWidgetDirty(WID_GL_LIST_VEHICLE);
 	}
-- 
cgit v1.2.3-54-g00ecf