aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2018-06-05 10:28:25 -0400
committerKen Moore <ken@ixsystems.com>2018-06-05 10:28:25 -0400
commitce107ff3c0b9f71c0997861473b2921928af594c (patch)
tree1a55e9c8b23b8d599621e5402c82c66831287312
parentAdd a quick option to allow forcing compositing on when starting up lumina. (diff)
downloadlumina-ce107ff3c0b9f71c0997861473b2921928af594c.tar.gz
lumina-ce107ff3c0b9f71c0997861473b2921928af594c.tar.bz2
lumina-ce107ff3c0b9f71c0997861473b2921928af594c.zip
Fix the compositing force flag. Missed one of the if setting checks earlier.
-rw-r--r--src-qt5/core/lumina-session/session.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp
index fe661e30..c4707626 100644
--- a/src-qt5/core/lumina-session/session.cpp
+++ b/src-qt5/core/lumina-session/session.cpp
@@ -104,7 +104,7 @@ void LSession::startProcess(QString ID, QString command, QStringList watchfiles)
void LSession::setupCompositor(bool force){
//Compositing manager
QSettings settings("lumina-desktop","sessionsettings");
- if(settings.value("enableCompositing",false).toBool()){
+ if(settings.value("enableCompositing",false).toBool() || force){
if(LUtils::isValidBinary("compton")){
//Compton available - check the config file
QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
@@ -126,8 +126,7 @@ void LSession::setupCompositor(bool force){
if( !hasAccel && settings.value("compositingWithGpuAccelOnly",true).toBool() ){ startcompton = false; }
}
QString disp = getenv("DISPLAY");
- //if(startcompton && QFile::exists(set)){ startProcess("compositing","compton -d "+disp+" --config \""+set+"\"", QStringList() << set); }
- /*else */if(startcompton || force){ startProcess("compositing","compton --backend xr_glx_hybrid -d "+disp); }
+ if(startcompton || force){ startProcess("compositing","compton --backend xr_glx_hybrid -d "+disp); }
}else if(LUtils::isValidBinary("xcompmgr") && !settings.value("compositingWithGpuAccelOnly",true).toBool() ){ startProcess("compositing","xcompmgr"); }
}
}
bgstack15