aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2020-03-25 16:19:12 -0400
committerKen Moore <moorekou@gmail.com>2020-03-25 16:19:12 -0400
commita0d5a4aa54a7ae7419025fd8975d0eb4dfe67272 (patch)
tree6994102ffec919ab873c5a64769e470808a4fac8
parentMerge pull request #721 from smarquespt/master (diff)
downloadlumina-a0d5a4aa54a7ae7419025fd8975d0eb4dfe67272.tar.gz
lumina-a0d5a4aa54a7ae7419025fd8975d0eb4dfe67272.tar.bz2
lumina-a0d5a4aa54a7ae7419025fd8975d0eb4dfe67272.zip
Switch to pkill from killall for restarting Fluxbox/Compton
More common on various Linux OS's instead of killall
-rw-r--r--src-qt5/core-utils/lumina-xconfig/MainUI.cpp2
-rw-r--r--src-qt5/core/lumina-desktop/LSession.cpp2
-rw-r--r--src-qt5/core/lumina-session/session.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src-qt5/core-utils/lumina-xconfig/MainUI.cpp b/src-qt5/core-utils/lumina-xconfig/MainUI.cpp
index 9abc30b2..98a8be0a 100644
--- a/src-qt5/core-utils/lumina-xconfig/MainUI.cpp
+++ b/src-qt5/core-utils/lumina-xconfig/MainUI.cpp
@@ -414,7 +414,7 @@ void MainUI::SaveSettings(bool quiet){
}
void MainUI::RestartFluxbox(){
- QProcess::startDetached("killall fluxbox");
+ QProcess::startDetached("pkill fluxbox");
}
void MainUI::removeProfile(){
diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp
index a49bbc96..32bd409f 100644
--- a/src-qt5/core/lumina-desktop/LSession.cpp
+++ b/src-qt5/core/lumina-desktop/LSession.cpp
@@ -561,7 +561,7 @@ void LSession::updateDesktops(){
//Make sure fluxbox also gets prompted to re-load screen config if the number of screens changes in the middle of a session
if(!firstrun && xchange){
qDebug() << "Update WM";
- //QProcess::startDetached("killall fluxbox");
+ //QProcess::startDetached("pkill fluxbox");
xchange = false;
}
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp
index 6115c365..fb6e84a5 100644
--- a/src-qt5/core/lumina-session/session.cpp
+++ b/src-qt5/core/lumina-session/session.cpp
@@ -100,7 +100,7 @@ void LSession::procFinished(){
//Note about compton: It does not like running multiple sessions under the *same user*
// (even on different displays). Run a blanket killall on it when closing down so that
// any other Lumina sessions will automatically restart compton on that specific display
- QProcess::execute("killall compton");
+ QProcess::execute("pkill compton"); //More OS's have pkill instead of killall
QCoreApplication::exit(0);
}else{
//Make sure we restart the process as needed
bgstack15