diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-04-23 07:08:40 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-04-23 07:08:40 -0400 |
| commit | fb111c1d1d4bb10846110e38ba53990aa657bc57 (patch) | |
| tree | 50ff3cbb1aecb3187aea36ee15e24738361fdf0b /lumina-desktop | |
| parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
| download | lumina-fb111c1d1d4bb10846110e38ba53990aa657bc57.tar.gz lumina-fb111c1d1d4bb10846110e38ba53990aa657bc57.tar.bz2 lumina-fb111c1d1d4bb10846110e38ba53990aa657bc57.zip | |
Get some more of the new WM functional. Still not ready to be used by the faint of heart.
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(); } } - |