# HG changeset patch
# User rubidium
# Date 1223465357 0
# Node ID 2119781291bab004f7a5c2ed83f3e5847d7d6a0d
# Parent  8a3f10afb85ecf221bfaa845f863a2aaaf88d899
(svn r14450) -Fix [FS#2337]: time table restoring did check too restrictively causing order backups not to be properly restored.

diff -r 8a3f10afb85e -r 2119781291ba src/timetable_cmd.cpp
--- a/src/timetable_cmd.cpp	Wed Oct 08 11:03:43 2008 +0000
+++ b/src/timetable_cmd.cpp	Wed Oct 08 11:29:17 2008 +0000
@@ -68,8 +68,8 @@
 	bool packed_time = HasBit(p1, 25);
 	bool is_journey = HasBit(p1, 24) || packed_time;
 
-	int wait_time   = -1;
-	int travel_time = -1;
+	int wait_time   = order->wait_time;
+	int travel_time = order->travel_time;
 	if (packed_time) {
 		travel_time = GB(p2, 0, 16);
 		wait_time   = GB(p2, 16, 16);;
@@ -79,7 +79,7 @@
 		wait_time   = GB(p2, 0, 16);
 	}
 
-	if (wait_time != -1) {
+	if (wait_time != order->wait_time) {
 		switch (order->GetType()) {
 			case OT_GOTO_STATION:
 				if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_TIMETABLE_NOT_STOPPING_HERE);
@@ -92,11 +92,11 @@
 		}
 	}
 
-	if (travel_time != -1 && order->IsType(OT_CONDITIONAL)) return CMD_ERROR;
+	if (travel_time != order->travel_time && order->IsType(OT_CONDITIONAL)) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
-		if (wait_time   != -1) ChangeTimetable(v, order_number, wait_time,   false);
-		if (travel_time != -1) ChangeTimetable(v, order_number, travel_time, true);
+		if (wait_time   != order->wait_time)   ChangeTimetable(v, order_number, wait_time,   false);
+		if (travel_time != order->travel_time) ChangeTimetable(v, order_number, travel_time, true);
 	}
 
 	return CommandCost();