diff options
| author | Weblate <noreply@weblate.org> | 2017-12-15 22:52:34 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-12-15 22:52:34 +0000 |
| commit | 9155556b94b0fe25ef3d5398a7f70dcdc1841d69 (patch) | |
| tree | ae5af06e4741c8767344be6d90a7307bcddb5b5d /src-qt5/core/lumina-desktop/WMProcess.cpp | |
| parent | Translated using Weblate (Russian) (diff) | |
| parent | Another minor networking fix. (diff) | |
| download | lumina-9155556b94b0fe25ef3d5398a7f70dcdc1841d69.tar.gz lumina-9155556b94b0fe25ef3d5398a7f70dcdc1841d69.tar.bz2 lumina-9155556b94b0fe25ef3d5398a7f70dcdc1841d69.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-desktop/WMProcess.cpp')
| -rw-r--r-- | src-qt5/core/lumina-desktop/WMProcess.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-desktop/WMProcess.cpp b/src-qt5/core/lumina-desktop/WMProcess.cpp index aa01b730..0687c1fe 100644 --- a/src-qt5/core/lumina-desktop/WMProcess.cpp +++ b/src-qt5/core/lumina-desktop/WMProcess.cpp @@ -30,7 +30,7 @@ void WMProcess::startWM(){ if(!isRunning()){this->start(cmd); } /*if(ssaver->state() == QProcess::NotRunning \ && LSession::handle()->sessionSettings()->value("WindowManager", "fluxbox").toString() != "lumina-wm"){ - ssaver->start("xscreensaver -no-splash"); + ssaver->start("xscreensaver -no-splash"); }*/ } @@ -52,8 +52,8 @@ void WMProcess::restartWM(){ inShutdown = true; this->kill(); if(!this->waitForFinished(5000) ){ this->terminate(); }; - inShutdown = false; - } + inShutdown = false; + } this->startWM(); } |