aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorq5sys <jt@xsystems.com>2017-10-31 10:10:51 -0400
committerq5sys <jt@xsystems.com>2017-10-31 10:10:51 -0400
commitadf9932d1a1a7a45a786753aca878ed906c25a49 (patch)
tree84b44b49bd0da11c10098cca2032b24396c3714c
parentFinish up the theme engine migration path (works fine now - after some testing). (diff)
downloadlumina-adf9932d1a1a7a45a786753aca878ed906c25a49.tar.gz
lumina-adf9932d1a1a7a45a786753aca878ed906c25a49.tar.bz2
lumina-adf9932d1a1a7a45a786753aca878ed906c25a49.zip
fix for XDG processing
-rw-r--r--src-qt5/core/libLumina/LUtils.cpp1
-rw-r--r--src-qt5/core/libLumina/LuminaXDG.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src-qt5/core/libLumina/LUtils.cpp b/src-qt5/core/libLumina/LUtils.cpp
index 65c6ac96..3d3c878a 100644
--- a/src-qt5/core/libLumina/LUtils.cpp
+++ b/src-qt5/core/libLumina/LUtils.cpp
@@ -123,6 +123,7 @@ bool LUtils::writeFile(QString filepath, QStringList contents, bool overwrite){
bool LUtils::isValidBinary(QString& bin){
//Trim off any quotes
if(bin.startsWith("\"") && bin.endsWith("\"")){ bin.chop(1); bin = bin.remove(0,1); }
+ if(bin.startsWith("\'") && bin.endsWith("\'")){ bin.chop(1); bin = bin.remove(0,1); }
//Now look for relative/absolute path
if(!bin.startsWith("/")){
//Relative path: search for it on the current "PATH" settings
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index aaca7bb1..492a296c 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -729,7 +729,8 @@ bool LFileInfo::isAVFile(){
bool LXDG::checkExec(QString exec){
//Return true(good) or false(bad)
//Check for quotes around the exec, and remove them as needed
- if(exec.startsWith("\"") && exec.count("\"")>=2){ exec = exec.section("\"",1,1); }
+ if(exec.startsWith("\"") && exec.count("\"")>=2){ exec = exec.section("\"",1,1).simplified(); }
+ if(exec.startsWith("\'") && exec.count("\'")>=2){ exec = exec.section("\'",1,1).simplified(); }
if(exec.startsWith("/")){ return QFile::exists(exec); }
else{
QStringList paths = QString(getenv("PATH")).split(":");
bgstack15