src: Fix error handling.

* src/encrypt.c (encrypt_status_handler): Fix error handling, ||
conflates errors.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-07-08 18:00:01 +02:00
parent 8a93f345b7
commit de74fe59fe

View File

@ -184,8 +184,13 @@ encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args)
static gpgme_error_t static gpgme_error_t
encrypt_status_handler (void *priv, gpgme_status_code_t code, char *args) encrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
{ {
return _gpgme_progress_status_handler (priv, code, args) gpgme_error_t err;
|| _gpgme_encrypt_status_handler (priv, code, args);
err = _gpgme_progress_status_handler (priv, code, args);
if (!err)
err = _gpgme_encrypt_status_handler (priv, code, args);
return err;
} }