From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Thu, 6 Apr 2006 14:54:00 +0000 (+0000)
Subject: Do not load the document twice when there isn't errors
X-Git-Tag: EVINCE_0_5_3~56
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;ds=sidebyside;h=48386837a0899cc7189e4194892ca94cb8b6e89a;p=evince.git

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 259bf04e..9a27aca0 100644
--- 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 d31506db..f8a3a4b8 100644
--- 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);