diff options
| -rw-r--r-- | xbmc/AdvancedSettings.cpp | 2 | ||||
| -rw-r--r-- | xbmc/Util.cpp | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/xbmc/AdvancedSettings.cpp b/xbmc/AdvancedSettings.cpp index 1ff0ff6d05..7f470ea38c 100644 --- a/xbmc/AdvancedSettings.cpp +++ b/xbmc/AdvancedSettings.cpp @@ -157,7 +157,7 @@ void CAdvancedSettings::Initialize() // foo.103*, 103 foo m_tvshowStackRegExps.push_back(TVShowRegexp(false,"[\\\\/\\._ -]([0-9]+)([0-9][0-9])([\\._ -][^\\\\/]*)$")); // Part I, Pt.VI - m_tvshowStackRegExps.push_back(TVShowRegexp(false,"[\\/._ -]p(?:ar)?t[_. -]()([ivxlcdm]+)([._ -][^\\/]*)$")); + m_tvshowStackRegExps.push_back(TVShowRegexp(false,"[\\/._ -]p(?:ar)?t[_. -]()([ivx]+)([._ -][^\\/]*)$")); m_tvshowMultiPartStackRegExp = "^[-_EeXx]+([0-9]+)"; diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp index 5fd7540481..603f5fb813 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp @@ -3148,8 +3148,7 @@ int CUtil::TranslateRomanNumeral(const char* roman_numeral) int temp_sum = 0, last = 0, repeat = 0, - trend = 1, - max = 1000; + trend = 1; decimal = 0; while (*roman_numeral) { @@ -3201,9 +3200,6 @@ int CUtil::TranslateRomanNumeral(const char* roman_numeral) temp_sum = digit; - if (max > last) - max = last; - trend = 1; repeat = 0; } @@ -3213,10 +3209,6 @@ int CUtil::TranslateRomanNumeral(const char* roman_numeral) if (repeat == 3) return -1; - // Large numerals cannot occur right of themself unless repeating - if (!repeat && digit >= max) - return -1; - last = digit; roman_numeral++; } |