summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/fqterm_path.cpp7
-rw-r--r--src/common/fqterm_path.h1
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/fqterm_path.cpp b/src/common/fqterm_path.cpp
index 3d192ee..7921da1 100644
--- a/src/common/fqterm_path.cpp
+++ b/src/common/fqterm_path.cpp
@@ -36,7 +36,7 @@
#include "../protocol/fqterm_local_socket.h"
namespace FQTerm {
-QString* FQTermLocalSocket::shell_bin_ = NULL;
+QString* local_shell_bin = NULL;
static QString getUserDataDir();
static QString getInstallPrefix();
static QString getResourceDir(const QString &prefix);
@@ -197,9 +197,8 @@ bool iniSettings() {
// fqterm local socket cmdline
QString externSSH = conf->getItemValue("global", "externSSH");
- if (!externSSH.isEmpty()) {
- FQTermLocalSocket::shell_bin_ = new QString(externSSH);
- }
+ if (!externSSH.isEmpty())
+ local_shell_bin = new QString(externSSH);
delete conf;
return true;
diff --git a/src/common/fqterm_path.h b/src/common/fqterm_path.h
index 08611be..8c92d92 100644
--- a/src/common/fqterm_path.h
+++ b/src/common/fqterm_path.h
@@ -29,6 +29,7 @@ class FQTermParam;
namespace FQTerm {
+extern QString *local_shell_bin;
enum PathCategory {RESOURCE, USER_CONFIG};
const QString &getPath(PathCategory category);