changeset 4450:ea574bee2030 draft

(svn r6228) -Fix: redrawing an empty list of shared vehicles will now close the window Since the order is no more, the player will not need that particular window anymore this could happen if the player opened the window and then sold all the vehicles (or crashed them) A crash could happen if a new order gets the same (now freed) OrderID and the vehicle using it is not of the same type as the window expect
author bjarni <bjarni@openttd.org>
date Tue, 29 Aug 2006 22:47:38 +0000
parents 3c486011c634
children b8ae7a140a40
files vehicle_gui.c
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/vehicle_gui.c
+++ b/vehicle_gui.c
@@ -1244,6 +1244,18 @@
 			switch (window_type) {
 				case VLW_SHARED_ORDERS:
 					/* Shared Orders */
+					if (vl->list_length == 0) {
+						/* The list is empty, so the last vehicle is sold or crashed */
+						/* Delete the window because the order is now not in use anymore */
+						switch (vehicle_type) {
+							case VEH_Train:    DeleteWindowById(WC_TRAINS_LIST,   w->window_number); break;
+							case VEH_Road:     DeleteWindowById(WC_ROADVEH_LIST,  w->window_number); break;
+							case VEH_Ship:     DeleteWindowById(WC_SHIPS_LIST,    w->window_number); break;
+							case VEH_Aircraft: DeleteWindowById(WC_AIRCRAFT_LIST, w->window_number); break;
+							default: NOT_REACHED(); break;
+						}
+						return;
+					}
 					SetDParam(0, w->vscroll.count);
 					w->widget[1].unkA  = STR_VEH_WITH_SHARED_ORDERS_LIST;
 					w->widget[9].unkA  = STR_EMPTY;