benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed race condition between notifcation and clipboard (cherry-pick with manual fix)

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-10-27 16:52:26 +02:00
parent 2bae14416e
commit f9f396bd69
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/storage/imgur/imguruploader.cpp
View File

@@ -79,10 +79,10 @@ void ImgurUploader::handleReply(QNetworkReply* reply)
resultStatus = true;
if (ConfigHandler().copyAndCloseAfterUploadEnabled()) {
QApplication::clipboard()->setText(imageUrl().toString());
SystemNotification().sendMessage(
QObject::tr("URL copied to clipboard."));
Controller::getInstance()->updateRecentScreenshots();
QApplication::clipboard()->setText(imageUrl().toString());
close();
} else {
onUploadOk();

2
src/tools/storage/s3/imgs3uploader.cpp
View File

@@ -198,9 +198,9 @@ void ImgS3Uploader::handleReplyUpload(QNetworkReply* reply)
// Copy url to clipboard if required
if (ConfigHandler().copyAndCloseAfterUploadEnabled()) {
QApplication::clipboard()->setText(imageUrl().toString());
SystemNotification().sendMessage(tr("URL copied to clipboard."));
Controller::getInstance()->updateRecentScreenshots();
QApplication::clipboard()->setText(imageUrl().toString());
close();
} else {
onUploadOk();