From 41b94233c6ee08f45c59b157f1be41f5c95f2c57 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 12 Sep 2020 00:32:50 +0200 Subject: [PATCH] Add group by version check in internet search view too --- src/internet/internetsearchview.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/internet/internetsearchview.cpp b/src/internet/internetsearchview.cpp index 81595d9c..02a7d2a8 100644 --- a/src/internet/internetsearchview.cpp +++ b/src/internet/internetsearchview.cpp @@ -240,10 +240,16 @@ void InternetSearchView::ReloadSettings() { break; } - SetGroupBy(CollectionModel::Grouping( - CollectionModel::GroupBy(s.value("search_group_by1", int(CollectionModel::GroupBy_AlbumArtist)).toInt()), - CollectionModel::GroupBy(s.value("search_group_by2", int(CollectionModel::GroupBy_AlbumDisc)).toInt()), - CollectionModel::GroupBy(s.value("search_group_by3", int(CollectionModel::GroupBy_None)).toInt()))); + int group_by_version = s.value("search_group_by_version", 0).toInt(); + if (group_by_version == 1 && s.contains("search_group_by1") && s.contains("search_group_by2") && s.contains("search_group_by3")) { + SetGroupBy(CollectionModel::Grouping( + CollectionModel::GroupBy(s.value("search_group_by1", int(CollectionModel::GroupBy_AlbumArtist)).toInt()), + CollectionModel::GroupBy(s.value("search_group_by2", int(CollectionModel::GroupBy_AlbumDisc)).toInt()), + CollectionModel::GroupBy(s.value("search_group_by3", int(CollectionModel::GroupBy_None)).toInt()))); + } + else { + SetGroupBy(CollectionModel::Grouping(CollectionModel::GroupBy(CollectionModel::GroupBy_AlbumArtist), CollectionModel::GroupBy(CollectionModel::GroupBy_AlbumDisc), CollectionModel::GroupBy(CollectionModel::GroupBy_None))); + } s.endGroup(); s.beginGroup(AppearanceSettingsPage::kSettingsGroup); @@ -694,6 +700,7 @@ void InternetSearchView::SetGroupBy(const CollectionModel::Grouping &g) { // Save the setting QSettings s; s.beginGroup(service_->settings_group()); + s.setValue("search_group_by_version", 1); s.setValue("search_group_by1", int(g.first)); s.setValue("search_group_by2", int(g.second)); s.setValue("search_group_by3", int(g.third));