diff options
| -rw-r--r-- | language/English/strings.xml | 1 | ||||
| -rw-r--r-- | xbmc/settings/GUISettings.cpp | 2 | ||||
| -rw-r--r-- | xbmc/video/VideoDatabase.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/language/English/strings.xml b/language/English/strings.xml index fc4ca2c968..df36830e59 100644 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -1902,6 +1902,7 @@ <string id="20455">Listeners</string> <string id="20456">Set movieset fanart</string> <string id="20457">Movie set</string> + <string id="20458">Group movies in sets</string> <!-- up to 21329 is reserved for the video db !! !--> <string id="21330">Show hidden files and directories</string> diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp index 766c2c6f34..f00303bec6 100644 --- a/xbmc/settings/GUISettings.cpp +++ b/xbmc/settings/GUISettings.cpp @@ -554,7 +554,7 @@ void CGUISettings::Initialize() flattenTVShowOptions.insert(make_pair(20422, 2)); AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, flattenTVShowOptions, SPIN_CONTROL_TEXT); - AddBool(NULL, "videolibrary.flattenmoviesets", 22002, false); + AddBool(vdl, "videolibrary.groupmoviesets", 20458, false); AddBool(vdl, "videolibrary.updateonstartup", 22000, false); AddBool(vdl, "videolibrary.backgroundupdate", 22001, false); AddSeparator(vdl, "videolibrary.sep3"); diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp index f460a56670..3e9f422333 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp @@ -4715,7 +4715,7 @@ bool CVideoDatabase::GetMoviesByWhere(const CStdString& strBaseDir, const CStdSt strSQL += where; else { - if (fetchSets && !g_guiSettings.GetBool("videolibrary.flattenmoviesets")) + if (fetchSets && g_guiSettings.GetBool("videolibrary.groupmoviesets")) { GetSetsNav("videodb://1/7/", items, VIDEODB_CONTENT_MOVIES, ""); strSQL += PrepareSQL("WHERE movieview.idMovie NOT IN (SELECT idMovie FROM setlinkmovie s1 JOIN(SELECT idSet, COUNT(1) AS c FROM setlinkmovie GROUP BY idSet HAVING c>1) s2 ON s2.idSet=s1.idSet)"); |