diff options
author | Iru Dog <mytbk920423@gmail.com> | 2014-11-06 23:44:14 +0800 |
---|---|---|
committer | Iru Dog <mytbk920423@gmail.com> | 2014-11-06 23:44:14 +0800 |
commit | 833a96f230cd47e64987a97c88dbf7c132a931ac (patch) | |
tree | de675f9d74ed1a44ef965e10809cf204f0dcc609 /src/common/fqterm_path.cpp | |
parent | 6f0369acf0695b6f3a0e223e87af7e81d0db8b5f (diff) | |
parent | cbb190cd66de3d5af4324b9e6a9416c19b092518 (diff) | |
download | fqterm-833a96f230cd47e64987a97c88dbf7c132a931ac.tar.xz |
Merge branch 'master' into local_socket_test
Conflicts:
src/protocol/fqterm_local_socket.cpp
src/terminal/internal/fqterm_telnet.cpp
Diffstat (limited to 'src/common/fqterm_path.cpp')
-rw-r--r-- | src/common/fqterm_path.cpp | 9 |
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; } |