Fix: Don't restore backed up vehicle name if it's no longer unique. (#10979)
(cherry picked from commit 2097719f26
)
This commit is contained in:

committed by
Jonathan G Rennison

parent
e1cb4d2397
commit
1696ef6446
@@ -16,6 +16,7 @@
|
||||
#include "vehicle_base.h"
|
||||
#include "window_func.h"
|
||||
#include "station_map.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
#include "safeguards.h"
|
||||
|
||||
@@ -98,6 +99,9 @@ void OrderBackup::DoRestore(Vehicle *v)
|
||||
InvalidateWindowClassesData(WC_STATION_LIST, 0);
|
||||
}
|
||||
|
||||
/* Remove backed up name if it's no longer unique. */
|
||||
if (!this->name.empty() && !IsUniqueVehicleName(this->name.c_str())) this->name.clear();
|
||||
|
||||
v->CopyConsistPropertiesFrom(this);
|
||||
|
||||
/* Make sure orders are in range */
|
||||
|
Reference in New Issue
Block a user