Do not load the document twice when there isn't errors

2006-04-06  Carlos Garcia Campos  <carlosgc@gnome.org>
	* backend/ev-document-factory.c:
	Do not load the document twice when there isn't errors

diff --git a/ChangeLog b/ChangeLog
index 259bf04e6fb7b1555d3be4d1da2d3769976fb0a6..9a27aca0f62bf4416153f07de941563efb611a6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-06  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * backend/ev-document-factory.c:
+
+       Do not load the document twice when there isn't errors
+
 2006-04-03  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * backend/ev-attachment.c: 

diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c
index d31506db8b4fb64056c3be9b7184edcbe9bf447c..f8a3a4b8f7584496e144f464fa228c8c90d72d6e 100644 (file)
--- a/backend/ev-document-factory.c
+++ b/backend/ev-document-factory.c
@@ -259,7 +259,7 @@ get_document_from_uri (const char *uri, gboolean slow, GError **error)
                gnome_vfs_file_info_unref (info);
                return NULL;
        }
-       
+
        document = ev_document_factory_get_from_mime (info->mime_type);
                
        if (document == NULL) {
@@ -280,7 +280,7 @@ EvDocument *
 ev_document_factory_get_document (const char *uri, GError **error)
 {
        EvDocument *document;
-       
+
        document = get_document_from_uri (uri, FALSE, error);
 
        if (*error == NULL) {
@@ -290,6 +290,8 @@ ev_document_factory_get_document (const char *uri, GError **error)
        if (*error) {
                g_error_free (*error);
                *error = NULL;
+       } else {
+               return document;
        }
 
        document = get_document_from_uri (uri, TRUE, error);