diff -r 0c9b00251fce -r 8a7342eb3a78 order_gui.c
--- a/order_gui.c	Mon Nov 14 15:22:12 2005 +0000
+++ b/order_gui.c	Mon Nov 14 19:48:04 2005 +0000
@@ -472,13 +472,15 @@
 	}
 
 	case WE_RCLICK: {
-		Vehicle *v = GetVehicle(w->window_number);
-		int sel = OrderGetSel(w);
- 		if (e->click.widget != 8) break;
-		if (sel == v->num_orders || GetVehicleOrder(v, sel)->type != OT_GOTO_DEPOT)
+		Vehicle* v = GetVehicle(w->window_number);
+		int s = OrderGetSel(w);
+
+		if (e->click.widget != 8) break;
+		if (s == v->num_orders || GetVehicleOrder(v, s)->type != OT_GOTO_DEPOT) {
 			GuiShowTooltips(STR_8857_MAKE_THE_HIGHLIGHTED_ORDER);
-		else
+		} else {
 			GuiShowTooltips(STR_SERVICE_HINT);
+		}
 	} break;
 
 	case WE_4: {