From 14d6e699af5323e8f72390b04fdc2d69e73a585d Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Wed, 22 Apr 2020 18:25:35 +0200
Subject: [PATCH] X11: Fix re-getting clipboard content after aborted
Fixes #1356
Signed-off-by: Lukas Holecek <hluk@email.cz>
---
src/platform/x11/x11platformclipboard.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/platform/x11/x11platformclipboard.cpp b/src/platform/x11/x11platformclipboard.cpp
index dc6bf9d8a..e2d01a61c 100644
--- a/src/platform/x11/x11platformclipboard.cpp
+++ b/src/platform/x11/x11platformclipboard.cpp
@@ -224,7 +224,6 @@ void X11PlatformClipboard::updateClipboardData(X11PlatformClipboard::ClipboardDa
return;
clipboardData->timerEmitChange.stop();
- clipboardData->newDataTimestamp = newDataTimestamp;
clipboardData->abortCloning = false;
clipboardData->cloningData = true;
clipboardData->newData = cloneData(*data, clipboardData->formats, &clipboardData->abortCloning);
@@ -239,6 +238,7 @@ void X11PlatformClipboard::updateClipboardData(X11PlatformClipboard::ClipboardDa
if ( newDataTimestamp.isEmpty() && clipboardData->data == clipboardData->newData )
return;
+ clipboardData->newDataTimestamp = newDataTimestamp;
clipboardData->timerEmitChange.start();
}
--
GitLab