From a759c008cd97f5eb74563c48f5cb210d7cbc6f5f Mon Sep 17 00:00:00 2001
From: Sebastian Ramacher <sebastian+dev@ramacher.at>
Date: Wed, 20 Jun 2012 15:55:32 +0200
Subject: [PATCH] Don't send surfaces to widgets if we're about to close the
 document.

---
 render.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/render.c b/render.c
index 95320c7..062e51e 100644
--- a/render.c
+++ b/render.c
@@ -21,6 +21,7 @@ struct render_thread_s
 {
   GThreadPool* pool; /**< Pool of threads */
   GStaticMutex mutex; /**< Render lock */
+  bool about_to_close; /**< Render thread is to be freed */
 };
 
 static void
@@ -49,6 +50,7 @@ render_init(zathura_t* zathura)
     goto error_free;
   }
 
+  render_thread->about_to_close = false;
   g_thread_pool_set_sort_function(render_thread->pool, render_thread_sort, zathura);
   g_static_mutex_init(&render_thread->mutex);
 
@@ -67,6 +69,7 @@ render_free(render_thread_t* render_thread)
     return;
   }
 
+  render_thread->about_to_close = true;
   if (render_thread->pool) {
     g_thread_pool_free(render_thread->pool, TRUE, TRUE);
   }
@@ -78,7 +81,7 @@ render_free(render_thread_t* render_thread)
 bool
 render_page(render_thread_t* render_thread, zathura_page_t* page)
 {
-  if (render_thread == NULL || page == NULL || render_thread->pool == NULL) {
+  if (render_thread == NULL || page == NULL || render_thread->pool == NULL || render_thread->about_to_close == true) {
     return false;
   }
 
@@ -89,7 +92,7 @@ render_page(render_thread_t* render_thread, zathura_page_t* page)
 static bool
 render(zathura_t* zathura, zathura_page_t* page)
 {
-  if (zathura == NULL || page == NULL) {
+  if (zathura == NULL || page == NULL || zathura->sync.render_thread->about_to_close == false) {
     return false;
   }
 
@@ -171,11 +174,15 @@ render(zathura_t* zathura, zathura_page_t* page)
     }
   }
 
-  /* update the widget */
-  gdk_threads_enter();
-  GtkWidget* widget = zathura_page_get_widget(zathura, page);
-  zathura_page_widget_update_surface(ZATHURA_PAGE(widget), surface);
-  gdk_threads_leave();
+  if (zathura->sync.render_thread->about_to_close == false) {
+    /* update the widget */
+    gdk_threads_enter();
+    GtkWidget* widget = zathura_page_get_widget(zathura, page);
+    zathura_page_widget_update_surface(ZATHURA_PAGE(widget), surface);
+    gdk_threads_leave();
+  } else {
+    cairo_surface_destroy(surface);
+  }
 
   return true;
 }