--- a/aircraft_gui.c	Mon Nov 13 20:33:51 2006 +0000
+++ b/aircraft_gui.c	Tue Nov 14 00:02:02 2006 +0000
@@ -215,9 +215,11 @@
 	case WE_PAINT: {
 		const Vehicle *v = GetVehicle(w->window_number);
 		StringID str;
+		bool is_localplayer = v->owner == _local_player;
 
-		SetWindowWidgetDisabledState(w, 7, v->owner != _local_player);
-		SetWindowWidgetDisabledState(w, 8, !IsAircraftInHangarStopped(v) || v->owner != _local_player);
+		SetWindowWidgetDisabledState(w,  7, !is_localplayer);
+		SetWindowWidgetDisabledState(w,  8, !IsAircraftInHangarStopped(v) || !is_localplayer);
+		SetWindowWidgetDisabledState(w, 11, !is_localplayer);
 
 
 		/* draw widgets & caption */

--- a/roadveh_gui.c	Mon Nov 13 20:33:51 2006 +0000
+++ b/roadveh_gui.c	Tue Nov 14 00:02:02 2006 +0000
@@ -235,11 +235,13 @@
 	case WE_PAINT: {
 		Vehicle *v = GetVehicle(w->window_number);
 		StringID str;
+		bool is_localplayer = v->owner == _local_player;
 
-		SetWindowWidgetDisabledState(w, 7, v->owner != _local_player);
-		SetWindowWidgetDisabledState(w, 8, v->owner != _local_player);
+		SetWindowWidgetDisabledState(w,  7, !is_localplayer);
+		SetWindowWidgetDisabledState(w,  8, !is_localplayer);
+		SetWindowWidgetDisabledState(w, 11, !is_localplayer);
 		/* Disable refit button if vehicle not refittable */
-		SetWindowWidgetDisabledState(w, 12, v->owner != _local_player ||
+		SetWindowWidgetDisabledState(w, 12, !is_localplayer ||
 				_engine_info[v->engine_type].refit_mask == 0);
 
 		/* draw widgets & caption */

--- a/ship_gui.c	Mon Nov 13 20:33:51 2006 +0000
+++ b/ship_gui.c	Tue Nov 14 00:02:02 2006 +0000
@@ -380,11 +380,13 @@
 			Vehicle *v = GetVehicle(w->window_number);
 			StringID str;
 			bool refitable_and_stopped_in_depot = ShipVehInfo(v->engine_type)->refittable && IsShipInDepotStopped(v);
+			bool is_localplayer = v->owner == _local_player;
 
-			SetWindowWidgetDisabledState(w, 7, v->owner != _local_player);
-			SetWindowWidgetDisabledState(w, 8,
-			                             v->owner != _local_player ||      // Disable if owner is not local player
+			SetWindowWidgetDisabledState(w,  7, !is_localplayer);
+			SetWindowWidgetDisabledState(w,  8,
+			                             !is_localplayer ||      // Disable if owner is not local player
 			                             !refitable_and_stopped_in_depot); // Disable if the ship is not refitable or stopped in a depot
+			SetWindowWidgetDisabledState(w, 11, !is_localplayer);
 
 			/* draw widgets & caption */
 			SetDParam(0, v->string_id);