Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evince/ChangeLog,v
retrieving revision 1.799
diff -u -u -r1.799 ChangeLog
--- ChangeLog	4 Apr 2006 16:52:47 -0000	1.799
+++ ChangeLog	6 Apr 2006 09:25:45 -0000
@@ -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: 
Index: backend/ev-document-factory.c
===================================================================
RCS file: /cvs/gnome/evince/backend/ev-document-factory.c,v
retrieving revision 1.13
diff -u -u -r1.13 ev-document-factory.c
--- backend/ev-document-factory.c	3 Apr 2006 14:28:46 -0000	1.13
+++ backend/ev-document-factory.c	6 Apr 2006 09:25:45 -0000
@@ -259,7 +259,7 @@
 		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 @@
 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 @@
 	if (*error) {
 		g_error_free (*error);
 		*error = NULL;
+	} else {
+		return document;
 	}
 
 	document = get_document_from_uri (uri, TRUE, error);