rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed send clipboard thread time issue #4749

This commit is contained in:
Jerry (Xinyu Hou) 2015-06-12 11:18:29 -07:00
parent 1e89aa37c5
commit 72060e59b4
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,6 +273,7 @@ Client::leave()
if (m_sendClipboardThread != NULL) { if (m_sendClipboardThread != NULL) {
StreamChunker::interruptClipboard(); StreamChunker::interruptClipboard();
m_sendClipboardThread->wait();
m_sendClipboardThread = NULL; m_sendClipboardThread = NULL;
} }

2
src/lib/server/Server.cpp
View File

@ -509,6 +509,8 @@ Server::switchScreen(BaseClientProxy* dst,
// clipboard data could be corrupted on the other side // clipboard data could be corrupted on the other side
if (m_sendClipboardThread != NULL) { if (m_sendClipboardThread != NULL) {
StreamChunker::interruptClipboard(); StreamChunker::interruptClipboard();
m_sendClipboardThread->wait();
m_sendClipboardThread = NULL;
} }
// send the clipboard data to new active screen // send the clipboard data to new active screen