SRTSubtitleFormat: don't mix line endings in non-Windows

Originally committed to SVN as r6941.
This commit is contained in:
cantabile 2012-07-24 02:39:32 +00:00 committed by Thomas Goyne
parent b2fb39b67f
commit ef65262920

View file

@ -505,7 +505,11 @@ void SRTSubtitleFormat::WriteFile(const AssFile *src, wxString const& filename,
StripComments(copy.Line); StripComments(copy.Line);
RecombineOverlaps(copy.Line); RecombineOverlaps(copy.Line);
MergeIdentical(copy.Line); MergeIdentical(copy.Line);
#ifdef _WIN32
ConvertNewlines(copy.Line, "\r\n", false); ConvertNewlines(copy.Line, "\r\n", false);
#else
ConvertNewlines(copy.Line, "\n", false);
#endif
// Write lines // Write lines
int i=1; int i=1;