backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-06 05:12:26 +08:00
Code Issues Projects Releases Wiki Activity

Fixed error from merge

Browse Source
This commit is contained in:
XinyuHou
2015-04-14 13:44:10 +01:00
parent b4665b9cd5
commit 28eb85660f
8 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/client/Client.cpp
View File

@@ -77,7 +77,7 @@ Client::Client(
m_sendFileThread(NULL),
m_writeToDropDirThread(NULL),
m_socket(NULL),
m_useSecureNetwork(false)
m_useSecureNetwork(false),
m_args(args)
{
assert(m_socketFactory != NULL);
@@ -104,7 +104,7 @@ Client::Client(
&Client::handleFileRecieveCompleted));
}
if (enableCrypto) {
if (m_args.m_enableCrypto) {
m_useSecureNetwork = ARCH->plugin().exists(s_networkSecurity);
if (m_useSecureNetwork == false) {
LOG((CLOG_NOTE "crypto disabled because of ns plugin not available"));