Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5314 from ivan-leontiev/fix-globalsearch-sources 

Move global search settings loading later in "MainWindow" initialisation
This commit is contained in:
John Maguire 2016-03-30 16:44:34 +01:00
parent 1d07be584e 75d4731534
commit 807e4552e1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/mainwindow.cpp
View File

@ -251,9 +251,6 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
app_->library_backend(), tr("Library"), "library",
IconLoader::Load("folder-sound", IconLoader::Base), true, app_, this));
app_->global_search()->ReloadSettings();
global_search_view_->ReloadSettings();
connect(global_search_view_, SIGNAL(AddToPlaylist(QMimeData*)),
SLOT(AddToPlaylist(QMimeData*)));
@ -988,6 +985,11 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
ReloadSettings();
// The "GlobalSearchView" requires that "InternetModel" has already been
// initialised before reload settings.
app_->global_search()->ReloadSettings();
global_search_view_->ReloadSettings();
// Reload pretty OSD to avoid issues with fonts
osd_->ReloadPrettyOSDSettings();