# HG changeset patch
# User smatz <smatz@openttd.org>
# Date 1202559650 0
# Node ID 60d7ff4383fbdcf58410c0e2a89bcf6ce8760081
# Parent  4587b054005b8f058b2a8cd2571f28653fb1408a
(svn r12093) -Fix: do not set station owner for buoys when merging company

diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2887,7 +2887,7 @@
 		Station* st = GetStationByTile(tile);
 
 		SetTileOwner(tile, new_player);
-		st->owner = new_player;
+		if (!IsBuoy(tile)) st->owner = new_player; // do not set st->owner for buoys
 		RebuildStationLists();
 		InvalidateWindowClasses(WC_STATION_LIST);
 	} else {