diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-05-03 09:35:31 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-05-03 09:35:31 -0400 |
| commit | b7283bcd87e54643320164d724d7179732a26523 (patch) | |
| tree | e5ef664aa6ed013d9ac022135cd4caf7be8dcf1c /src-qt5/core/lumina-desktop/LDesktop.cpp | |
| parent | Clean up how the high-DPI settings for lumina are detected/enabled. (diff) | |
| parent | Merge remote-tracking branch 'origin/master' (diff) | |
| download | lumina-b7283bcd87e54643320164d724d7179732a26523.tar.gz lumina-b7283bcd87e54643320164d724d7179732a26523.tar.bz2 lumina-b7283bcd87e54643320164d724d7179732a26523.zip | |
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop/LDesktop.cpp')
| -rw-r--r-- | src-qt5/core/lumina-desktop/LDesktop.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp index 90c2f31f..01529b43 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.cpp +++ b/src-qt5/core/lumina-desktop/LDesktop.cpp @@ -375,11 +375,13 @@ void LDesktop::UpdateDesktop(){ } } //Also show anything available in the /media directory - QDir media("/media"); + if(settings->value(DPREFIX+"generateMediaIcons",true).toBool()){ + QDir media("/media"); QStringList mediadirs = media.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot, QDir::Name); for(int i=0; i<mediadirs.length(); i++){ filelist << media.absoluteFilePath(mediadirs[i]); } + } //qDebug() << "Found media Dirs:" << mediadirs; UpdateDesktopPluginArea(); bgDesktop->LoadItems(plugins, filelist); |