From 15956a670c5d1a9ddeb5f2b435eae1a7579fd6ed Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 9 Sep 2020 16:49:10 +0200
Subject: CrystFELImageView: Skip entire draw_sig if image is NULL

---
 src/crystfelimageview.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/crystfelimageview.c')

diff --git a/src/crystfelimageview.c b/src/crystfelimageview.c
index 997c34d5..3b71f1cd 100644
--- a/src/crystfelimageview.c
+++ b/src/crystfelimageview.c
@@ -497,6 +497,8 @@ static gint draw_sig(GtkWidget *window, cairo_t *cr, CrystFELImageView *iv)
 {
 	cairo_matrix_t m;
 
+	if ( iv->image == NULL ) return FALSE;
+
 	cairo_save(cr);
 
 	/* Overall background (light grey) */
@@ -512,7 +514,7 @@ static gint draw_sig(GtkWidget *window, cairo_t *cr, CrystFELImageView *iv)
 	cairo_translate(cr, -gtk_adjustment_get_value(iv->hadj),
 	                     gtk_adjustment_get_value(iv->vadj));
 
-	if ( (iv->image != NULL) && (iv->pixbufs != NULL) ) {
+	if ( iv->pixbufs != NULL ) {
 		int i;
 		for ( i=0; i<iv->image->detgeom->n_panels; i++ ) {
 			cairo_save(cr);
-- 
cgit v1.2.3