Commit c4f9a96c authored by Volker Krause's avatar Volker Krause
Browse files

Consider equipment types when merging locations

parent 0092cf04
......@@ -283,6 +283,9 @@ bool Location::isSame(const Location &lhs, const Location &rhs)
&& !RentalVehicleStation::isSame(lhs.rentalVehicleStation(), rhs.rentalVehicleStation())) {
return false;
}
if (lhs.type() == Location::Equipment && lhs.equipment().type() != rhs.equipment().type()) {
return false;
}
// name
if (isSameName(lhs.name(), rhs.name())) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment