aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2023-10-18 09:13:35 +0000
committerAndre Heinecke <[email protected]>2023-10-18 09:13:35 +0000
commitab25df8328d9248abc2816403e6051e00d5b1095 (patch)
treebd2dfada7ae815c405ec3b6963fb1c978823cc92
parentqt,doc: Fix typos in source code comments (diff)
downloadgpgme-ab25df8328d9248abc2816403e6051e00d5b1095.tar.gz
gpgme-ab25df8328d9248abc2816403e6051e00d5b1095.zip
qt: Handle cancel in changeexpiryjob
* lang/qt/src/qgpgmechangeexpiryjob.cpp (change_expiry): Return cancel error. -- The classical "cancel is not an error" problem. GnuPG-Bug-Id: T6754
-rw-r--r--lang/qt/src/qgpgmechangeexpiryjob.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp
index 3cca6ca8..c6cb3f85 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.cpp
+++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp
@@ -103,7 +103,7 @@ static QGpgMEChangeExpiryJob::result_type change_expiry(Context *ctx, const Key
if (subkeys.empty() || (options & ChangeExpiryJob::UpdatePrimaryKey)) {
// update the expiration date of the primary key
auto err = ctx->setExpire(key, expires);
- if (err) {
+ if (err || err.isCanceled()) {
return std::make_tuple(err, QString(), Error());
}
}