From: Marco Pesenti Gritti <marco@gnome.org>
Date: Fri, 25 Feb 2005 10:00:58 +0000 (+0000)
Subject: Fix crash when opening in new window
X-Git-Tag: EVINCE_0_1_5~8
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;ds=sidebyside;h=d4e3d8364345a6b8ab0ee4fff2bfbf57402aa7e8;p=evince.git

Fix crash when opening in new window

2005-02-25  Marco Pesenti Gritti  <marco@gnome.org>

        * pdf/xpdf/pdf-document.cc:

        Fix crash when opening in new window
---

diff --git a/ChangeLog b/ChangeLog
index c653f0cd..3e8a0941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-25  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* pdf/xpdf/pdf-document.cc:
+
+	Fix crash when opening in new window
+
 2005-02-25  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* configure.ac:
diff --git a/pdf/xpdf/pdf-document.cc b/pdf/xpdf/pdf-document.cc
index bfc5bf8a..4e90c091 100644
--- a/pdf/xpdf/pdf-document.cc
+++ b/pdf/xpdf/pdf-document.cc
@@ -138,18 +138,20 @@ document_init_links (PdfDocument *pdf_document)
 static void
 document_display_page (PdfDocument *pdf_document)
 {
-	pdf_document->doc->displayPage (pdf_document->out, pdf_document->page,
-					72 * pdf_document->scale,
-					72 * pdf_document->scale,
-					0, gTrue, gTrue);
-
-	document_init_links (pdf_document);
-
-	/* Update the search results available to the app since
-	 * we only provide full results on the current page
-         */
-	if (pdf_document->search)
-		pdf_document_search_page_changed (pdf_document->search);
+	if (pdf_document->out != NULL) {
+		pdf_document->doc->displayPage (pdf_document->out, pdf_document->page,
+						72 * pdf_document->scale,
+						72 * pdf_document->scale,
+						0, gTrue, gTrue);
+
+		document_init_links (pdf_document);
+
+		/* Update the search results available to the app since
+		 * we only provide full results on the current page
+	         */
+		if (pdf_document->search)
+			pdf_document_search_page_changed (pdf_document->search);
+	}
 }
 
 static gboolean
@@ -309,9 +311,8 @@ pdf_document_set_target (EvDocument  *document,
 			if (pdf_document->doc)
 				pdf_document->out->startDoc(pdf_document->doc->getXRef());
 
+			document_display_page (pdf_document);
 		}
-
-		/* FIXME we need to regenerate pages */
 	}
 }