diff options
| author | Kacper Michajłow <kasper93@gmail.com> | 2017-03-06 10:50:50 +0300 |
|---|---|---|
| committer | Kacper Michajłow <kasper93@gmail.com> | 2017-03-06 10:50:50 +0300 |
| commit | b989276ec26ede85b20ab469460882c850edcbcd (patch) | |
| tree | 34ea494e14c919f8bca51b55c95c92303a147c89 /src/Subtitles/PGSSub.cpp | |
| parent | d911f14d5619d800819d6f4658e72236720b79af (diff) | |
| parent | ba2ea5d9e0cf5451398dfd438a0a962a0fe6fd74 (diff) | |
Merge branch 'release-1.7.11'1.7.11
Diffstat (limited to 'src/Subtitles/PGSSub.cpp')
| -rw-r--r-- | src/Subtitles/PGSSub.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Subtitles/PGSSub.cpp b/src/Subtitles/PGSSub.cpp index d2abfd0f2..047030aaa 100644 --- a/src/Subtitles/PGSSub.cpp +++ b/src/Subtitles/PGSSub.cpp @@ -1,5 +1,5 @@ /*
- * (C) 2006-2015 see Authors.txt
+ * (C) 2006-2016 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -41,7 +41,7 @@ CPGSSub::CPGSSub(CCritSec* pLock, const CString& name, LCID lcid) , m_nSegSize(0)
{
if (m_name.IsEmpty() || m_name == _T("Unknown")) {
- m_name = "PGS Embedded Subtitle";
+ m_name = _T("PGS Embedded Subtitle");
}
}
@@ -496,8 +496,9 @@ bool CPGSSubFile::Open(CString fn, CString name /*= _T("")*/, CString videoName {
bool bOpened = false;
+ CString guessed = Subtitle::GuessSubtitleName(fn, videoName, m_lcid, m_eHearingImpaired);
if (name.IsEmpty()) {
- m_name = Subtitle::GuessSubtitleName(fn, videoName);
+ m_name = guessed;
} else {
m_name = name;
}
|