From 5807bee23bf99bae273fd90687d7e0c379bd4a86 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 7 Mar 2021 00:54:20 +0100 Subject: [PATCH] Load album cover controller settings when album cover manager is opened --- src/core/mainwindow.cpp | 1 - src/covermanager/albumcovermanager.cpp | 10 +--------- src/covermanager/albumcovermanager.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 4d8f1614d..12f701214 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -1117,7 +1117,6 @@ void MainWindow::ReloadAllSettings() { app_->playlist_manager()->playlist_container()->ReloadSettings(); app_->album_cover_loader()->ReloadSettings(); album_cover_choice_controller_->ReloadSettings(); - if (cover_manager_.get()) cover_manager_->ReloadSettings(); context_view_->ReloadSettings(); file_view_->ReloadSettings(); queue_view_->ReloadSettings(); diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp index 0e7f480a5..e3cee9095 100644 --- a/src/covermanager/albumcovermanager.cpp +++ b/src/covermanager/albumcovermanager.cpp @@ -153,8 +153,6 @@ AlbumCoverManager::AlbumCoverManager(Application *app, CollectionBackend *collec EnableCoversButtons(); - ReloadSettings(); - } AlbumCoverManager::~AlbumCoverManager() { @@ -164,13 +162,6 @@ AlbumCoverManager::~AlbumCoverManager() { } -void AlbumCoverManager::ReloadSettings() { - - app_->album_cover_loader()->ReloadSettings(); - album_cover_choice_controller_->ReloadSettings(); - -} - void AlbumCoverManager::Init() { // View menu @@ -252,6 +243,7 @@ void AlbumCoverManager::showEvent(QShowEvent *e) { if (!e->spontaneous()) { LoadGeometry(); + album_cover_choice_controller_->ReloadSettings(); Reset(); } diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h index cc4fed3b1..cae4e9e78 100644 --- a/src/covermanager/albumcovermanager.h +++ b/src/covermanager/albumcovermanager.h @@ -80,7 +80,6 @@ class AlbumCoverManager : public QMainWindow { void Reset(); void Init(); - void ReloadSettings(); void EnableCoversButtons(); void DisableCoversButtons();