[glib-networking/wip/openssl-2-46: 17/28] Propagate error if there is an error to propagate

[Ignacio Casal Quinteiro <icq src gnome org>]

commit cbb58c09c8c69ca0f031af23516e5d9bf742d26e
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Fri Sep 25 11:40:33 2015 +0200

    Propagate error if there is an error to propagate

 tls/openssl/gtlsconnection-openssl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/tls/openssl/gtlsconnection-openssl.c b/tls/openssl/gtlsconnection-openssl.c
index f83f6d7..ef48c7d 100644
--- a/tls/openssl/gtlsconnection-openssl.c
+++ b/tls/openssl/gtlsconnection-openssl.c
@@ -143,7 +143,9 @@ end_openssl_io (GTlsConnectionOpenssl  *openssl,
       return status;
     }
 
-  g_propagate_error (error, my_error);
+  if (my_error != NULL)
+    g_propagate_error (error, my_error);
+
   if (error && !*error)
     {
       va_list ap;