diff options
| author | taxigps <taxigps@svn> | 2010-07-20 23:45:30 +0000 |
|---|---|---|
| committer | taxigps <taxigps@svn> | 2010-07-20 23:45:30 +0000 |
| commit | 3f8ccd4b90386815fd07fe092326e2174efb8136 (patch) | |
| tree | bfdb9b90d20f8f11518a2a6832ec18b9182f69b9 | |
| parent | 02de88c0061203f5cd942f692cbcb4452627d80d (diff) | |
fixed: #9682 - Surplus carriage return in sami subtitle
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32025 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp index eb4787f7a4..3404f98109 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp @@ -78,6 +78,9 @@ bool CDVDSubtitleParserSami::Open(CDVDStreamInfo &hints) CDVDOverlayText* pOverlay = NULL; while (m_pStream->ReadLine(line, sizeof(line))) { + if ((strlen(line) > 0) && (line[strlen(line) - 1] == '\r')) + line[strlen(line) - 1] = 0; + int pos = reg.RegFind(line); const char* text = line; if (pos > -1) |