Merge branch 'develop' of pwmt.org:zathura into develop

This commit is contained in:
Sebastian Ramacher 2012-02-07 14:57:06 +01:00
commit 1c0920a190
2 changed files with 2 additions and 2 deletions

View file

@ -16,7 +16,7 @@
void void
config_load_default(zathura_t* zathura) config_load_default(zathura_t* zathura)
{ {
if (!zathura || !zathura->ui.session) { if (zathura == NULL || zathura->ui.session == NULL) {
return; return;
} }

View file

@ -242,7 +242,7 @@ zathura_page_view_update_surface(ZathuraPageView* widget, cairo_surface_t* surfa
{ {
zathura_page_view_private_t* priv = ZATHURA_PAGE_VIEW_GET_PRIVATE(widget); zathura_page_view_private_t* priv = ZATHURA_PAGE_VIEW_GET_PRIVATE(widget);
g_static_mutex_lock(&(priv->lock)); g_static_mutex_lock(&(priv->lock));
if (priv->surface) { if (priv->surface != NULL) {
cairo_surface_destroy(priv->surface); cairo_surface_destroy(priv->surface);
} }
priv->surface = surface; priv->surface = surface;