--- a/src/train_cmd.cpp	Sat Aug 02 22:56:07 2008 +0000
+++ b/src/train_cmd.cpp	Sat Aug 02 22:56:21 2008 +0000
@@ -3654,6 +3654,13 @@
 								if (VehicleFromPos(o_tile, &exitdir, &CheckVehicleAtSignal) == NULL) return;
 							}
 						}
+
+						/* If we would reverse but are currently in a PBS block and
+						 * reversing of stuck trains is disabled, don't reverse. */
+						if (_settings_game.pf.wait_for_pbs_path == 255 && UpdateSignalsOnSegment(v->tile, enterdir, v->owner) == SIGSEG_PBS) {
+							v->load_unload_time_rem = 0;
+							return;
+						}
 						goto reverse_train_direction;
 					}
 				} else {