From f9f396bd693e41fb1b2eb1ca1dd474f69019ef35 Mon Sep 17 00:00:00 2001
From: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
Date: Tue, 27 Oct 2020 16:52:26 +0200
Subject: [PATCH] fixed race condition between notifcation and clipboard
 (cherry-pick with manual fix)

---
 src/tools/storage/imgur/imguruploader.cpp | 2 +-
 src/tools/storage/s3/imgs3uploader.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/storage/imgur/imguruploader.cpp b/src/tools/storage/imgur/imguruploader.cpp
index 565f6372..db449061 100644
--- a/src/tools/storage/imgur/imguruploader.cpp
+++ b/src/tools/storage/imgur/imguruploader.cpp
@@ -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();
diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp
index 7a7c846f..6012121a 100644
--- a/src/tools/storage/s3/imgs3uploader.cpp
+++ b/src/tools/storage/s3/imgs3uploader.cpp
@@ -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();