backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-13 15:15:21 +08:00
Code Issues Projects Releases Wiki Activity

Conflicts:

Browse Source 
src/lib/client/Client.cpp
	src/lib/net/TCPSocketFactory.cpp
This commit is contained in:
Jerry (Xinyu Hou)
2016-08-24 15:14:12 +01:00
committed by Andrew Nelless
parent e32402b5c6
commit 95464d97cf
7 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,10 +435,19 @@ Client::setupConnecting()
{
assert(m_stream != NULL);
m_events->adoptHandler(m_events->forIDataSocket().connected(),
m_stream->getEventTarget(),
new TMethodEventJob<Client>(this,
if (m_args.m_enableCrypto) {
m_events->adoptHandler(m_events->forIDataSocket().secureConnected(),
m_stream->getEventTarget(),
new TMethodEventJob<Client>(this,
&Client::handleConnected));
}
else {
m_events->adoptHandler(m_events->forIDataSocket().connected(),
m_stream->getEventTarget(),
new TMethodEventJob<Client>(this,
&Client::handleConnected));
}
m_events->adoptHandler(m_events->forIDataSocket().connectionFailed(),
m_stream->getEventTarget(),
new TMethodEventJob<Client>(this,
@@ -589,8 +598,6 @@ Client::handleConnected(const Event&, void*)
m_sentClipboard[id] = false;
m_timeClipboard[id] = 0;
}
m_socket->secureConnect();
}
void