mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-01-31 00:54:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't send surfaces to widgets if we're about to close the document.

Browse source
This commit is contained in:
Sebastian Ramacher 2012-06-20 15:55:32 +02:00
parent 0c6f0f8e7e
commit a759c008cd
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
render.c
View file

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