Skip to content

Commit 677e668

Browse files
Merge pull request #344 from g-maxime/remove-tag
Fix IsOriginal() to take account of AdaptEOL setting
2 parents 1fa8091 + 2bee1f2 commit 677e668

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

Source/Riff/Riff_Handler.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3551,10 +3551,18 @@ bool Riff_Handler::IsOriginal(const string &Field, const string &Value, Riff_Bas
35513551
if (Field=="timereference (translated)" && Chunk_Strings && Chunk_Strings->Strings.find("timereference")!=Chunk_Strings->Strings.end())
35523552
return IsOriginal_Internal("timereference", Get_Internal("timereference"));
35533553

3554+
string Value2;
35543555
if (Chunk_Strings->Histories[Field].empty())
3555-
return Value==Chunk_Strings->Strings[Field];
3556-
3557-
return Value==Chunk_Strings->Histories[Field][0].To_UTF8();
3556+
{
3557+
AdaptEOL(Chunk_Strings->Strings[Field], Value2);
3558+
Value2=Value2.empty()?Chunk_Strings->Strings[Field]:Value2;
3559+
}
3560+
else
3561+
{
3562+
AdaptEOL(Chunk_Strings->Histories[Field][0].To_UTF8(), Value2);
3563+
Value2=Value2.empty()?Chunk_Strings->Histories[Field][0].To_UTF8():Value2;
3564+
}
3565+
return Value==Value2;
35583566
}
35593567

35603568
//---------------------------------------------------------------------------

0 commit comments

Comments
 (0)