--- a/economy.c	Thu Mar 24 14:33:05 2005 +0000
+++ b/economy.c	Thu Mar 24 14:43:40 2005 +0000
@@ -1346,8 +1346,6 @@
 	assert(v->current_order.type == OT_LOADING);
 
 	v->cur_speed = 0;
-	old_player = _current_player;
-	_current_player = v->owner;
 
 	st = GetStation(last_visited = v->last_station_visited);
 
@@ -1455,6 +1453,9 @@
 		TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY);
 	}
 
+	old_player = _current_player;
+	_current_player = v->owner;
+
 	if (result != 0) {
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);