X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatwidget.cpp;h=8a70a6df89d0fe9bddc016e998a0dc3558f5cd92;hp=6c2da6ef9061f2c3aa757f5e5f4ec1dee7118ace;hb=d07c7f8e2de851adefcee45049bb1bb19682d0c6;hpb=d20a7344ab4774cc8a3a27c3925c2f4922ad07f6

diff --git a/src/qtui/chatwidget.cpp b/src/qtui/chatwidget.cpp
index 6c2da6ef..8a70a6df 100644
--- a/src/qtui/chatwidget.cpp
+++ b/src/qtui/chatwidget.cpp
@@ -423,7 +423,11 @@ void ChatWidget::mouseReleaseEvent(QMouseEvent *event) {
         selectionStart = qMin(dragStartLine, curLine);
         selectionEnd = qMax(dragStartLine, curLine);
         // TODO Make X11SelectionMode configurable!
+#ifdef Q_WS_X11
+        QApplication::clipboard()->setText(selectionToString(), QClipboard::Selection);
+#else
         QApplication::clipboard()->setText(selectionToString());
+#endif
         break;
       default:
         mouseMode = Normal;
@@ -624,7 +628,7 @@ void ChatWidget::viewportChanged(int newPos) {
     if(buffer->contents().isEmpty())
       return;
     MsgId msgId = buffer->contents().first()->msgId();
-    if(!lastBacklogOffset.isValid() || msgId < lastBacklogOffset && lastBacklogSize + REQUEST_COUNT <= buffer->contents().count()) {
+    if(!lastBacklogOffset.isValid() || (msgId < lastBacklogOffset && lastBacklogSize + REQUEST_COUNT <= buffer->contents().count())) {
       Client::backlogManager()->requestBacklog(bufferId, REQUEST_COUNT, msgId.toInt());
       lastBacklogOffset = msgId;
       lastBacklogSize = buffer->contents().size();