Commit 0892bcd1 authored by Cédric Bellegarde's avatar Cédric Bellegarde

Respect new option name

parent 62096524
......@@ -601,7 +601,8 @@ class Container(Gtk.Bin):
is_compilation = artist_ids and artist_ids[0] == Type.COMPILATIONS
if genre_ids and genre_ids[0] == Type.ALL:
if is_compilation or\
App().settings.get_value("show-compilations"):
App().settings.get_value(
"show-compilations-in-album-view"):
items = App().albums.get_compilation_ids()
if not is_compilation:
items += App().albums.get_ids()
......@@ -621,7 +622,8 @@ class Container(Gtk.Bin):
items = App().albums.get_randoms()
else:
if is_compilation or\
App().settings.get_value("show-compilations"):
App().settings.get_value(
"show-compilations-in-album-view"):
items = App().albums.get_compilation_ids(genre_ids)
if not is_compilation:
items += App().albums.get_ids([], genre_ids)
......
......@@ -182,7 +182,7 @@ class Player(BinPlayer, QueuePlayer, PlaylistPlayer, RadioPlayer,
album_ids += App().albums.get_ids(artist_ids)
# Genres: all, Artists: all
else:
if App().settings.get_value("show-compilations"):
if App().settings.get_value("show-compilations-in-album-view"):
album_ids += App().albums.get_compilation_ids()
album_ids += App().albums.get_ids()
# We are in populars view, add popular albums
......@@ -208,7 +208,8 @@ class Player(BinPlayer, QueuePlayer, PlaylistPlayer, RadioPlayer,
album_ids += App().albums.get_compilation_ids(genre_ids)
else:
if not artist_ids and\
App().settings.get_value("show-compilations"):
App().settings.get_value(
"show-compilations-in-album-view"):
album_ids += App().albums.get_compilation_ids(genre_ids)
album_ids += App().albums.get_ids(artist_ids, genre_ids)
# Create album objects
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment