Add some additional error checking to the new "Open Terminal Here" functionality in lumina-fm.

1 files changed, 11 insertions, 0 deletions

diff --git a/lumina-fm/MainUI.cpp b/lumina-fm/MainUI.cpp
index 3cc66d97..68764997 100644
--- a/lumina-fm/MainUI.cpp
+++ b/lumina-fm/MainUI.cpp
@@ -1438,6 +1438,17 @@ void MainUI::openTerminal(){
   QSettings *sessionsettings = new QSettings( QSettings::UserScope, "LuminaDE","sessionsettings", this);
   //xterm remains the default
   QString defTerminal = sessionsettings->value("default-terminal", "xterm").toString();
+  if(defTerminal.endsWith(".desktop")){
+    //Pull the binary name out of the shortcut
+    bool ok = false;
+    XDGDesktop DF = LXDG::loadDesktopFile(defTerminal,ok);
+    if(!ok){ defTerminal = "xterm"; }
+    else{ defTerminal = DF.exec.section(" ",0,0); } //only take the binary name - not any other flags
+  }
+  if( !LUtils::isValidBinary(defTerminal) ){
+    //The binary does not exist or is invalid
+    defTerminal = "xterm";
+  }	  
   if(sel.isEmpty()){ 
     //-e is the parameter for most of the terminal appliction to execute an external command. 
     //In your case we start a shell in the selected directory