#4740 Moved clipboard transfering back into main thread on client

This commit is contained in:
XinyuHou
2016-09-01 11:46:52 +01:00
committed by Andrew Nelless
parent 82043ca435
commit 4ad2c6b10d
2 changed files with 21 additions and 104 deletions

View File

@@ -163,8 +163,7 @@ public:
virtual String getName() const;
private:
void fillClipboard(ClipboardID, Clipboard*);
void sendClipboard(ClipboardID, Clipboard*);
void sendClipboard(ClipboardID);
void sendEvent(Event::Type, void*);
void sendConnectionFailedEvent(const char* msg);
void sendFileChunk(const void* data);
@@ -224,8 +223,4 @@ private:
TCPSocket* m_socket;
bool m_useSecureNetwork;
ClientArgs& m_args;
Thread* m_sendClipboardThread;
Mutex* m_mutex;
bool m_condData;
CondVar<bool>* m_condVar;
};