aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kortstiege <mkortstiege@users.noreply.github.com>2015-03-31 16:56:17 +0200
committerMatthias Kortstiege <mkortstiege@users.noreply.github.com>2015-03-31 16:56:17 +0200
commitfcabf6f7e7ade78e4ede3f7f10f1691b9a0f7cbf (patch)
tree3835ca7c4b3d835dc38497a703dfde274b30d827
parentc29d91b7d894757d4c814e76df27930e47804251 (diff)
parent5b8cd80a3629b17c93ffbb97f2a4b7eca4d18174 (diff)
Merge pull request #6835 from mkortstiege/stack-fix
[stacking] remove loose 'd' from video stack expressions
-rw-r--r--xbmc/settings/AdvancedSettings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 4598624b4a..fbfd89b963 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -221,8 +221,8 @@ void CAdvancedSettings::Initialize()
m_folderStackRegExps.push_back("((cd|dvd|dis[ck])[0-9]+)$");
m_videoStackRegExps.clear();
- m_videoStackRegExps.push_back("(.*?)([ _.-]*(?:cd|dvd|p(?:(?:ar)?t)|dis[ck]|d)[ _.-]*[0-9]+)(.*?)(\\.[^.]+)$");
- m_videoStackRegExps.push_back("(.*?)([ _.-]*(?:cd|dvd|p(?:(?:ar)?t)|dis[ck]|d)[ _.-]*[a-d])(.*?)(\\.[^.]+)$");
+ m_videoStackRegExps.push_back("(.*?)([ _.-]*(?:cd|dvd|p(?:(?:ar)?t)|dis[ck])[ _.-]*[0-9]+)(.*?)(\\.[^.]+)$");
+ m_videoStackRegExps.push_back("(.*?)([ _.-]*(?:cd|dvd|p(?:(?:ar)?t)|dis[ck])[ _.-]*[a-d])(.*?)(\\.[^.]+)$");
m_videoStackRegExps.push_back("(.*?)([ ._-]*[a-d])(.*?)(\\.[^.]+)$");
// This one is a bit too greedy to enable by default. It will stack sequels
// in a flat dir structure, but is perfectly safe in a dir-per-vid one.