Merge branch 'master' into local_socket_test

Conflicts:
	src/protocol/fqterm_local_socket.cpp
	src/terminal/internal/fqterm_telnet.cpp

1 files changed, 8 insertions, 1 deletions

diff --git a/src/common/fqterm_path.cpp b/src/common/fqterm_path.cpp
index 88ee385..3d192ee 100644
--- a/src/common/fqterm_path.cpp
+++ b/src/common/fqterm_path.cpp
@@ -33,9 +33,10 @@
 #include "fqterm_param.h"
 #include "fqterm_path.h"
 #include "fqterm_font.h"
+#include "../protocol/fqterm_local_socket.h"
 
 namespace FQTerm {
-
+QString* FQTermLocalSocket::shell_bin_ = NULL;
 static QString getUserDataDir();
 static QString getInstallPrefix();
 static QString getResourceDir(const QString &prefix);
@@ -194,6 +195,12 @@ bool iniSettings() {
     return false;
   }
 
+  // fqterm local socket cmdline
+  QString externSSH = conf->getItemValue("global", "externSSH");
+  if (!externSSH.isEmpty()) {
+    FQTermLocalSocket::shell_bin_ = new QString(externSSH);
+  }
+
   delete conf;
   return true;
 }