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

Merge branch 'helkanen-master'

This commit is contained in:
Xinyu Hou 2014-10-24 15:10:44 +01:00
parent e707b426cf 9e358233c3
commit df29bf8e54
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/platform/XWindowsClipboard.cpp
View File

@ -937,8 +937,14 @@ CXWindowsClipboard::pushReplies()
for (CReplyMap::iterator index = m_replies.begin(); for (CReplyMap::iterator index = m_replies.begin();
index != m_replies.end(); ) { index != m_replies.end(); ) {
assert(!index->second.empty()); assert(!index->second.empty());
if (!index->second.front()->m_replied) { CReplyList::iterator listit = index->second.begin();
pushReplies(index, index->second, index->second.begin()); while (listit != index->second.end()) {
if (!(*listit)->m_replied)
break;
++listit;
}
if (listit != index->second.end() && !(*listit)->m_replied) {
pushReplies(index, index->second, listit);
} }
else { else {
++index; ++index;