Skip to content
Snippets Groups Projects
Commit 14d6e699 authored by hluk's avatar hluk
Browse files

X11: Fix re-getting clipboard content after aborted


Fixes #1356

Signed-off-by: default avatarLukas Holecek <hluk@email.cz>
parent d7ad7b66
No related branches found
No related tags found
No related merge requests found
......@@ -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();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment