diff options
| author | Justus Winter <[email protected]> | 2016-07-08 16:00:01 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-07-08 16:03:36 +0000 |
| commit | de74fe59feef9adc858ac04004880bfd44315d0d (patch) | |
| tree | 61e05c78afee21d0b28a2960815b34501db9f4ef | |
| parent | python: Fix raising stashed exceptions. (diff) | |
| download | gpgme-de74fe59feef9adc858ac04004880bfd44315d0d.tar.gz gpgme-de74fe59feef9adc858ac04004880bfd44315d0d.zip | |
src: Fix error handling.
* src/encrypt.c (encrypt_status_handler): Fix error handling, ||
conflates errors.
Signed-off-by: Justus Winter <[email protected]>
| -rw-r--r-- | src/encrypt.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/encrypt.c b/src/encrypt.c index 8672cd36..307c862b 100644 --- a/src/encrypt.c +++ b/src/encrypt.c @@ -184,8 +184,13 @@ encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args) static gpgme_error_t encrypt_status_handler (void *priv, gpgme_status_code_t code, char *args) { - return _gpgme_progress_status_handler (priv, code, args) - || _gpgme_encrypt_status_handler (priv, code, args); + gpgme_error_t err; + + err = _gpgme_progress_status_handler (priv, code, args); + if (!err) + err = _gpgme_encrypt_status_handler (priv, code, args); + + return err; } |