Skip to content

Commit

Permalink
Partial revert of commit d5d7d71 Refactor ParseFileinfoResults() to h…
Browse files Browse the repository at this point in the history
…andle multiple matching locks in case of multiple destination branches

Considers a "Retained" lock as meaningful only if it is retained on another branch

NOTE: this is required to avoid the Unreal Editor showing a pop-up warning preventing the user to save the asset
  • Loading branch information
SRombautsU committed Feb 26, 2024
1 parent 45c761b commit 0e8b294
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,9 @@ void ParseFileinfoResults(const TArray<FString>& InResults, TArray<FPlasticSourc
{
ConcatStrings(FileState.LockedBy, TEXT(", "), Lock->Owner);
}
else
// Considers a "Retained" lock as meaningful only if it is retained on another branch
// NOTE: this is required to avoid the Unreal Editor showing a popup warning preventing the user to save the asset
else if (Lock->Branch != BranchName)
{
ConcatStrings(FileState.RetainedBy, TEXT(", "), Lock->Owner);
}
Expand Down

0 comments on commit 0e8b294

Please sign in to comment.