# HG changeset patch
# User Ricardo@FX-8150
# Date 1516920577 0
#      Thu Jan 25 22:49:37 2018 +0000
# Branch trunk
# Node ID 8fc4fb8ac545b9c9c757136ccc0fdba6f31f4445
# Parent  437a5c7b0b81f96fe16ab21e1fd51e37226e1115
10

diff -r 437a5c7b0b81 -r 8fc4fb8ac545 src/aircraft_cmd.cpp
--- a/src/aircraft_cmd.cpp	Tue Jan 23 18:45:40 2018 +0000
+++ b/src/aircraft_cmd.cpp	Thu Jan 25 22:49:37 2018 +0000
@@ -1493,7 +1493,8 @@
 		AircraftEventHandler_EnterTerminal(v, apc);
 		/* on an airport with helipads, a helicopter will always land there
 		 * and get serviced at the same time - setting */
-		if (_settings_game.order.serviceathelipad) {
+		if ((!_settings_game.order.no_servicing_if_no_breakdowns || _settings_game.difficulty.vehicle_breakdowns != 0) &&
+				_settings_game.order.serviceathelipad) {
 			if (v->subtype == AIR_HELICOPTER && apc->num_helipads > 0) {
 				/* an excerpt of ServiceAircraft, without the invisibility stuff */
 				v->date_of_last_service = _date;