aboutsummaryrefslogtreecommitdiff
path: root/libLumina
diff options
context:
space:
mode:
authorJoshDW19 <joshms@pcbsd.org>2016-04-04 14:43:28 -0400
committerJoshDW19 <joshms@pcbsd.org>2016-04-04 14:43:28 -0400
commit489507d8fac4a526902c1c7ff018d7b1ef1f4b81 (patch)
treea08e71c3745cf8a92ff5aec2e847654265714383 /libLumina
parentRemove the old commented out resizeEvent() from the cpp file. Not needed anym... (diff)
downloadlumina-489507d8fac4a526902c1c7ff018d7b1ef1f4b81.tar.gz
lumina-489507d8fac4a526902c1c7ff018d7b1ef1f4b81.tar.bz2
lumina-489507d8fac4a526902c1c7ff018d7b1ef1f4b81.zip
Fix a bug causing the "open terminal here" dialog not to work properly.
Diffstat (limited to 'libLumina')
-rw-r--r--libLumina/LuminaUtils.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp
index 4cb830b1..e25596f8 100644
--- a/libLumina/LuminaUtils.cpp
+++ b/libLumina/LuminaUtils.cpp
@@ -152,7 +152,7 @@ bool LUtils::isValidBinary(QString& bin){
QString LUtils::GenerateOpenTerminalExec(QString term, QString dirpath){
//Check the input terminal application (default/fallback - determined by calling application)
- if(!LUtils::isValidBinary(term)){
+ //if(!LUtils::isValidBinary(term)){
if(term.endsWith(".desktop")){
//Pull the binary name out of the shortcut
bool ok = false;
@@ -162,11 +162,12 @@ QString LUtils::GenerateOpenTerminalExec(QString term, QString dirpath){
}else{
term = "xterm"; //fallback
}
- }
+ //}
//Now create the calling command for the designated terminal
// NOTE: While the "-e" routine is supposed to be universal, many terminals do not properly use it
// so add some special/known terminals here as necessary
QString exec;
+ qWarning() << " - Reached terminal initialization" << term;
if(term=="mate-terminal" || term=="lxterminal" || term=="gnome-terminal"){
exec = term+" --working-directory=\""+dirpath+"\"";
}else if(term=="xfce4-terminal"){
@@ -181,6 +182,7 @@ QString LUtils::GenerateOpenTerminalExec(QString term, QString dirpath){
if(!LUtils::isValidBinary(shell)){ shell = "/bin/sh"; } //universal fallback for a shell
exec = term + " -e \"cd " + dirpath + " && " + shell + " \" ";
}
+ qDebug() << exec;
return exec;
}
bgstack15