Commit 59dc605d authored by Volker Krause's avatar Volker Krause
Browse files

Set correct transfer floating location type when tied to reservations

Fixes the favorite location combo box not getting hidden for transfers
tied to reservations in some cases.
parent d20dc1f9
...@@ -309,6 +309,7 @@ TransferManager::CheckTransferResult TransferManager::checkTransferBefore(const ...@@ -309,6 +309,7 @@ TransferManager::CheckTransferResult TransferManager::checkTransferBefore(const
qDebug() << res << prevRes << LocationUtil::name(toLoc) << LocationUtil::name(prevLoc) << transfer.anchorTime(); qDebug() << res << prevRes << LocationUtil::name(toLoc) << LocationUtil::name(prevLoc) << transfer.anchorTime();
transfer.setFrom(PublicTransport::locationFromPlace(prevLoc, prevRes)); transfer.setFrom(PublicTransport::locationFromPlace(prevLoc, prevRes));
transfer.setFromName(LocationUtil::name(prevLoc)); transfer.setFromName(LocationUtil::name(prevLoc));
transfer.setFloatingLocationType(Transfer::Reservation);
return isLocationChange ? ShouldAutoAdd : CanAddManually; return isLocationChange ? ShouldAutoAdd : CanAddManually;
} }
...@@ -373,6 +374,7 @@ TransferManager::CheckTransferResult TransferManager::checkTransferAfter(const Q ...@@ -373,6 +374,7 @@ TransferManager::CheckTransferResult TransferManager::checkTransferAfter(const Q
qDebug() << res << nextRes << LocationUtil::name(fromLoc) << LocationUtil::name(nextLoc) << transfer.anchorTime(); qDebug() << res << nextRes << LocationUtil::name(fromLoc) << LocationUtil::name(nextLoc) << transfer.anchorTime();
transfer.setTo(PublicTransport::locationFromPlace(nextLoc, nextRes)); transfer.setTo(PublicTransport::locationFromPlace(nextLoc, nextRes));
transfer.setToName(LocationUtil::name(nextLoc)); transfer.setToName(LocationUtil::name(nextLoc));
transfer.setFloatingLocationType(Transfer::Reservation);
return isLocationChange ? ShouldAutoAdd : CanAddManually; return isLocationChange ? ShouldAutoAdd : CanAddManually;
} }
......
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