From b1d4135354d217e5304c865aa9c5f8961f2f1b22 Mon Sep 17 00:00:00 2001 From: Cyberbeing Date: Sun, 7 Dec 2014 05:13:47 -0800 Subject: [PATCH] Reorder external subtitle loading priority Resolves occasional crash loading VOBSUB .sub files --- src/filters/transform/vsfilter/DirectVobSub.cpp | 4 ++-- src/filters/transform/vsfilter/auto_load_helper.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/filters/transform/vsfilter/DirectVobSub.cpp b/src/filters/transform/vsfilter/DirectVobSub.cpp index 3222131f0..8ed606abc 100644 --- a/src/filters/transform/vsfilter/DirectVobSub.cpp +++ b/src/filters/transform/vsfilter/DirectVobSub.cpp @@ -1223,7 +1223,7 @@ CDirectVobSub::CDirectVobSub( const Option *options, CCritSec * pLock ) //fix me: CStringw = CString m_xy_str_opt[STRING_LOAD_EXT_LIST] = - theApp.GetProfileString(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_LOAD_EXT_LIST), _T("ass;ssa;srt;sub;idx;sup;txt;usf;xss;ssf;smi;psb;rt")); + theApp.GetProfileString(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_LOAD_EXT_LIST), _T("ass;ssa;srt;idx;sup;txt;usf;xss;ssf;smi;psb;rt;sub")); CString str_pgs_yuv_setting = theApp.GetProfileString(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_PGS_COLOR_TYPE), _T("GUESS.GUESS")); if (str_pgs_yuv_setting.Left(2).CompareNoCase(_T("TV"))==0) @@ -1577,7 +1577,7 @@ CDVS4XySubFilter::CDVS4XySubFilter( const Option *options, CCritSec * pLock ) //fix me: CStringw = CString m_xy_str_opt[STRING_LOAD_EXT_LIST] = - theApp.GetProfileString(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_LOAD_EXT_LIST), _T("ass;ssa;srt;sub;idx;sup;txt;usf;xss;ssf;smi;psb;rt")); + theApp.GetProfileString(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_LOAD_EXT_LIST), _T("ass;ssa;srt;idx;sup;txt;usf;xss;ssf;smi;psb;rt;sub")); CString str_pgs_yuv_setting = theApp.GetProfileString(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_PGS_COLOR_TYPE), _T("GUESS.GUESS")); if (str_pgs_yuv_setting.Left(2).CompareNoCase(_T("TV"))==0) diff --git a/src/filters/transform/vsfilter/auto_load_helper.cpp b/src/filters/transform/vsfilter/auto_load_helper.cpp index 9424dc9ec..11194a7ba 100644 --- a/src/filters/transform/vsfilter/auto_load_helper.cpp +++ b/src/filters/transform/vsfilter/auto_load_helper.cpp @@ -74,7 +74,7 @@ XySubFilterAutoLoader::XySubFilterAutoLoader( LPUNKNOWN punk, HRESULT* phr m_load_web = !!theApp.GetProfileInt( ResStr(IDS_R_GENERAL), ResStr(IDS_RG_WEBLOAD ), 0); m_load_embedded = !!theApp.GetProfileInt( ResStr(IDS_R_GENERAL), ResStr(IDS_RG_EMBEDDEDLOAD ), 1); m_load_exts = theApp.GetProfileString(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_LOAD_EXT_LIST), - _T("ass;ssa;srt;sub;idx;sup;txt;usf;xss;ssf;smi;psb;rt")); + _T("ass;ssa;srt;idx;sup;txt;usf;xss;ssf;smi;psb;rt;sub")); m_loaded = false;