diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-04-25 11:22:07 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-04-25 11:22:07 -0400 |
| commit | ba9680dae066300fcd8675894a9521b54ff0a126 (patch) | |
| tree | 29f276185ee950b2d7c4be48b2e189778b86504e /lumina-desktop | |
| parent | Commit a few random changes on my dev system - just to sync up with the repo. (diff) | |
| parent | Get some more of the new WM functional. Still not ready to be used by the fai... (diff) | |
| download | lumina-ba9680dae066300fcd8675894a9521b54ff0a126.tar.gz lumina-ba9680dae066300fcd8675894a9521b54ff0a126.tar.bz2 lumina-ba9680dae066300fcd8675894a9521b54ff0a126.zip | |
Merge branch 'master' of github.com:pcbsd/lumina
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/WMProcess.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lumina-desktop/WMProcess.cpp b/lumina-desktop/WMProcess.cpp index e704091a..a2a4933f 100644 --- a/lumina-desktop/WMProcess.cpp +++ b/lumina-desktop/WMProcess.cpp @@ -28,7 +28,10 @@ void WMProcess::startWM(){ inShutdown = false; QString cmd = setupWM(); if(!isRunning()){this->start(cmd); } - if(ssaver->state() == QProcess::NotRunning){ ssaver->start("xscreensaver -no-splash"); } + if(ssaver->state() == QProcess::NotRunning \ + && LSession::handle()->sessionSettings()->value("WindowManager", "fluxbox").toString() != "lumina-wm"){ + ssaver->start("xscreensaver -no-splash"); + } } void WMProcess::stopWM(){ @@ -128,4 +131,3 @@ void WMProcess::processFinished(int exitcode, QProcess::ExitStatus status){ cleanupConfig(); } } - |