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

Interrupted file transfer when cursor move back #4584

This commit is contained in:
Jerry (Xinyu Hou) 2015-06-04 13:09:48 -07:00
parent e0903983ad
commit 646e1b52eb
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,6 +257,11 @@ Client::enter(SInt32 xAbs, SInt32 yAbs, UInt32, KeyModifierMask mask, bool)
m_active = true; m_active = true;
m_screen->mouseMove(xAbs, yAbs); m_screen->mouseMove(xAbs, yAbs);
m_screen->enter(mask); m_screen->enter(mask);
if (m_sendFileThread != NULL) {
StreamChunker::interruptFile();
m_sendFileThread = NULL;
}
} }
bool bool
@ -268,6 +273,7 @@ Client::leave()
if (m_sendClipboardThread != NULL) { if (m_sendClipboardThread != NULL) {
StreamChunker::interruptClipboard(); StreamChunker::interruptClipboard();
m_sendClipboardThread = NULL;
} }
m_sendClipboardThread = new Thread( m_sendClipboardThread = new Thread(

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

@ -1993,6 +1993,11 @@ Server::onMouseMoveSecondary(SInt32 dx, SInt32 dy)
} while (false); } while (false);
if (jump) { if (jump) {
if (m_sendFileThread != NULL) {
StreamChunker::interruptFile();
m_sendFileThread = NULL;
}
// switch screens // switch screens
switchScreen(newScreen, m_x, m_y, false); switchScreen(newScreen, m_x, m_y, false);
} }