github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修正macOS版助手设置界面展示不了的问题。

pull/105/head
ApexLiu 2017-11-26 22:34:37 +08:00
parent 03aade65d9
commit b2a2316e96
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
client/tp_assist_macos/src/csrc/ts_env.cpp
View File

@ -24,34 +24,12 @@ bool TsEnv::init(const char* cfg_file, const char* res_path)
ex_astr2wstr(cfg_file, m_cfg_file);
ex_astr2wstr(res_path, m_res_path);
// if (!ex_exec_file(m_exec_file))
// return false;
//
// m_exec_path = m_exec_file;
// if (!ex_dirname(m_exec_path))
// return false;
//
// m_ssh_client_conf_file = m_exec_path;
// ex_path_join(m_ssh_client_conf_file, false, L"cfg", L"ssh.ini", NULL);
//
// m_scp_client_conf_file = m_exec_path;
// ex_path_join(m_scp_client_conf_file, false, L"cfg", L"scp.ini", NULL);
//
// m_telnet_client_conf_file = m_exec_path;
// ex_path_join(m_telnet_client_conf_file, false, L"cfg", L"telnet.ini", NULL);
//
// m_log_path = m_exec_path;
// ex_path_join(m_log_path, false, L"log", NULL);
#ifdef EX_DEBUG
m_site_path = L"/Users/apex/work/eomsoft/teleport-dev/client/tp_assist_macos/site";
#else
//#ifdef EX_DEBUG
// m_site_path = L"/Users/apex/work/eomsoft/teleport-dev/client/tp_assist_macos/site";
//#else
m_site_path = m_res_path;
ex_path_join(m_res_path, false, L"site", NULL);
#endif
ex_path_join(m_site_path, false, L"site", NULL);
//#endif
// m_tools_path = m_exec_path;
// ex_path_join(m_tools_path, false, L"tools", NULL);
return true;
}

1
common/libex/src/ex_ini.cpp
View File

@ -275,7 +275,6 @@ bool ExIniFile::LoadFromMemory(const ex_wstr& strData, bool bClearOld)
posLF = ex_wstr::npos;
posCR = strAll.find(L"\r");
posLF = strAll.find(L"\n");
int tttt = 0;
if(posCR == ex_wstr::npos && posLF == ex_wstr::npos) {
if (strAll.empty())