diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-01-23 07:59:22 -0500 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-01-23 07:59:22 -0500 |
| commit | 1e168bee6bf766ed348e8c6ec30ad0a1afc51f6d (patch) | |
| tree | 7c9e5bbd3189fa08625746b9ac34d9409d7885ce /libLumina/LuminaUtils.cpp | |
| parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
| parent | Also read /etc/luminaDesktop.conf. (diff) | |
| download | lumina-1e168bee6bf766ed348e8c6ec30ad0a1afc51f6d.tar.gz lumina-1e168bee6bf766ed348e8c6ec30ad0a1afc51f6d.tar.bz2 lumina-1e168bee6bf766ed348e8c6ec30ad0a1afc51f6d.zip | |
Merge pull request #40 from ajacoutot/etc-conf
Also read /etc/luminaDesktop.conf.
Diffstat (limited to 'libLumina/LuminaUtils.cpp')
| -rw-r--r-- | libLumina/LuminaUtils.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp index b82ee599..fb2e31bd 100644 --- a/libLumina/LuminaUtils.cpp +++ b/libLumina/LuminaUtils.cpp @@ -151,6 +151,8 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile(LOS::AppPrefix()+"etc/luminaDesktop.conf.dist"); } if(sysDefaults.isEmpty() && !skipOS) { sysDefaults = LUtils::readFile(LOS::SysPrefix()+"etc/luminaDesktop.conf"); } if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile(LOS::SysPrefix()+"etc/luminaDesktop.conf.dist"); } + if(sysDefaults.isEmpty() && !skipOS) { sysDefaults = LUtils::readFile("/etc/luminaDesktop.conf"); } + if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile("/etc/luminaDesktop.conf.dist"); } if(sysDefaults.isEmpty()){ sysDefaults = LUtils::readFile(LOS::LuminaShare()+"luminaDesktop.conf"); } //Find the number of the left-most desktop screen QString screen = "0"; |