From 96fdda5c7349ef8359f333ced90193e33dbb9420 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Tue, 5 Dec 2006 14:18:58 +0000
Subject: [PATCH] (svn r7373) -Codechange: when removing a GRF from the list,
 make the next one selected, or the previous file if the last item is being
 removed. This makes clearing the list easier.

---
 newgrf_gui.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/newgrf_gui.c b/newgrf_gui.c
index 7d7eb4f2c7..ae14401a92 100644
--- a/newgrf_gui.c
+++ b/newgrf_gui.c
@@ -331,15 +331,24 @@ static void NewGRFWndProc(Window *w, WindowEvent *e)
 				}
 
 				case 4: { /* Remove GRF */
-					GRFConfig **pc, *c;
+					GRFConfig **pc, *c, *newsel;
+
+					/* Choose the next GRF file to be the selected file */
+					newsel = WP(w, newgrf_d).sel->next;
+
 					for (pc = WP(w, newgrf_d).list; (c = *pc) != NULL; pc = &c->next) {
+						/* If the new selection is empty (i.e. we're deleting the last item
+						 * in the list, pick the file just before the selected file */
+						if (newsel == NULL && c->next == WP(w, newgrf_d).sel) newsel = c;
+
 						if (c == WP(w, newgrf_d).sel) {
 							*pc = c->next;
 							free(c);
 							break;
 						}
 					}
-					WP(w, newgrf_d).sel = NULL;
+
+					WP(w, newgrf_d).sel = newsel;
 					SetupNewGRFWindow(w);
 					SetWindowDirty(w);
 					break;