1 files changed, 10 insertions, 5 deletions
diff --git a/lang/qt/src/qgpgmesignarchivejob.cpp b/lang/qt/src/qgpgmesignarchivejob.cpp
index fc36d886..4a0e1f7f 100644
--- a/lang/qt/src/qgpgmesignarchivejob.cpp
+++ b/lang/qt/src/qgpgmesignarchivejob.cpp
@@ -138,18 +138,23 @@ static QGpgMESignArchiveJob::result_type sign_to_filename(Context *ctx,
                                                           const QString &outputFileName,
                                                           const QString &baseDirectory)
 {
+    PartialFileGuard partFileGuard{outputFileName};
+    if (partFileGuard.tempFileName().isEmpty()) {
+        return std::make_tuple(SigningResult{Error::fromCode(GPG_ERR_EEXIST)}, QString{}, Error{});
+    }
+
     Data outdata;
 #ifdef Q_OS_WIN
-    outdata.setFileName(outputFileName.toUtf8().constData());
+    outdata.setFileName(partFileGuard.tempFileName().toUtf8().constData());
 #else
-    outdata.setFileName(QFile::encodeName(outputFileName).constData());
+    outdata.setFileName(QFile::encodeName(partFileGuard.tempFileName()).constData());
 #endif
 
     const auto result = sign(ctx, signers, paths, outdata, baseDirectory);
     const auto &signingResult = std::get<0>(result);
-    if (signingResult.error().code()) {
-        // ensure that the output file is removed if the operation was canceled or failed
-        removeFile(outputFileName);
+    if (!signingResult.error().code()) {
+        // the operation succeeded -> save the result under the requested file name
+        partFileGuard.commit();
     }
 
     return result;