(svn r22821) -Fix [FS#4741]: Allow to demolish aqueducts built in the scenario editor.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index ec98fc1ce..3d8ee8937 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -673,9 +673,15 @@ static inline CommandCost CheckAllowRemoveTunnelBridge(TileIndex tile)
 		}
 
 		case TRANSPORT_RAIL:
-		case TRANSPORT_WATER:
 			return CheckOwnership(GetTileOwner(tile));
 
+		case TRANSPORT_WATER: {
+			/* Always allow to remove aqueducts without owner. */
+			Owner aqueduct_owner = GetTileOwner(tile);
+			if (aqueduct_owner == OWNER_NONE) aqueduct_owner = _current_company;
+			return CheckOwnership(aqueduct_owner);
+		}
+
 		default: NOT_REACHED();
 	}
 }